[gcc r15-2079] c++/modules: Propagate BINDING_VECTOR_*_DUPS_P on realloc [PR99242]

[Nathaniel Shead via Gcc-cvs]

https://gcc.gnu.org/g:1aa0f1627857c3e2d90982bdb07ca78ca10b26f3

commit r15-2079-g1aa0f1627857c3e2d90982bdb07ca78ca10b26f3
Author: Nathaniel Shead <nathanielosh...@gmail.com>
Date:   Mon Jul 8 22:25:17 2024 +1000

    c++/modules: Propagate BINDING_VECTOR_*_DUPS_P on realloc [PR99242]
    
    When importing modules, when a binding vector for a name runs out of
    slots it gets reallocated with a larger size, and existing bindings are
    copied across.  However, the flags to indicate whether deduping needs to
    occur did not: this causes ICEs, as it allows a duplicate binding to be
    added which then violates assumptions later on.
    
            PR c++/99242
    
    gcc/cp/ChangeLog:
    
            * name-lookup.cc (append_imported_binding_slot): Propagate dups
            flags.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/modules/pr99242_a.H: New test.
            * g++.dg/modules/pr99242_b.H: New test.
            * g++.dg/modules/pr99242_c.H: New test.
            * g++.dg/modules/pr99242_d.C: New test.
    
    Signed-off-by: Nathaniel Shead <nathanielosh...@gmail.com>

Diff:
---
 gcc/cp/name-lookup.cc                    | 4 ++++
 gcc/testsuite/g++.dg/modules/pr99242_a.H | 3 +++
 gcc/testsuite/g++.dg/modules/pr99242_b.H | 3 +++
 gcc/testsuite/g++.dg/modules/pr99242_c.H | 3 +++
 gcc/testsuite/g++.dg/modules/pr99242_d.C | 7 +++++++
 5 files changed, 20 insertions(+)

diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc
index 361dc3d953d1..8823ab71c600 100644
--- a/gcc/cp/name-lookup.cc
+++ b/gcc/cp/name-lookup.cc
@@ -353,6 +353,10 @@ append_imported_binding_slot (tree *slot, tree name, 
unsigned ix)
 
       tree new_vec = make_binding_vec (name, want);
       BINDING_VECTOR_NUM_CLUSTERS (new_vec) = have + 1;
+      BINDING_VECTOR_GLOBAL_DUPS_P (new_vec)
+       = BINDING_VECTOR_GLOBAL_DUPS_P (*slot);
+      BINDING_VECTOR_PARTITION_DUPS_P (new_vec)
+       = BINDING_VECTOR_PARTITION_DUPS_P (*slot);
       memcpy (BINDING_VECTOR_CLUSTER_BASE (new_vec),
              BINDING_VECTOR_CLUSTER_BASE (*slot),
              have * sizeof (binding_cluster));
diff --git a/gcc/testsuite/g++.dg/modules/pr99242_a.H 
b/gcc/testsuite/g++.dg/modules/pr99242_a.H
new file mode 100644
index 000000000000..2df0b4184ab3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99242_a.H
@@ -0,0 +1,3 @@
+// { dg-additional-options "-fmodule-header" }
+// { dg-module-cmi {} }
+bool __is_constant_evaluated();
diff --git a/gcc/testsuite/g++.dg/modules/pr99242_b.H 
b/gcc/testsuite/g++.dg/modules/pr99242_b.H
new file mode 100644
index 000000000000..2df0b4184ab3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99242_b.H
@@ -0,0 +1,3 @@
+// { dg-additional-options "-fmodule-header" }
+// { dg-module-cmi {} }
+bool __is_constant_evaluated();
diff --git a/gcc/testsuite/g++.dg/modules/pr99242_c.H 
b/gcc/testsuite/g++.dg/modules/pr99242_c.H
new file mode 100644
index 000000000000..2df0b4184ab3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99242_c.H
@@ -0,0 +1,3 @@
+// { dg-additional-options "-fmodule-header" }
+// { dg-module-cmi {} }
+bool __is_constant_evaluated();
diff --git a/gcc/testsuite/g++.dg/modules/pr99242_d.C 
b/gcc/testsuite/g++.dg/modules/pr99242_d.C
new file mode 100644
index 000000000000..1046d1af9846
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99242_d.C
@@ -0,0 +1,7 @@
+// { dg-additional-options "-fmodules-ts" }
+bool __is_constant_evaluated();
+import "pr99242_a.H";
+void f() { __is_constant_evaluated(); }
+import "pr99242_b.H";
+import "pr99242_c.H";
+void g() { __is_constant_evaluated(); }