diff options
| author | Patrick Palka <ppalka@redhat.com> | 2022-09-20 10:19:30 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2022-09-20 10:19:30 -0400 |
| commit | 84b2ab97e412d9514730db335a795c7db2fb42cc (patch) | |
| tree | 379055cd7af4fee6cdf3c8a726d32de3e8261b52 /gcc/cp | |
| parent | a8bb495a5627bba44407dedbe38653bb0432d811 (diff) | |
| download | gcc-84b2ab97e412d9514730db335a795c7db2fb42cc.zip gcc-84b2ab97e412d9514730db335a795c7db2fb42cc.tar.gz gcc-84b2ab97e412d9514730db335a795c7db2fb42cc.tar.bz2 | |
c++: stream PACK_EXPANSION_EXTRA_ARGS [PR106761]
It looks like after the libstdc++ commit r13-2158-g02f6b405f0e9dc
some xtreme-header-* tests are failing with "conflicting global module
declaration" errors ultimately because we're neglecting to stream
PACK_EXPANSION_EXTRA_ARGS, which leads to wrong equivalences of
different partial instantiations of _TupleConstraints::__constructible.
PR c++/106761
gcc/cp/ChangeLog:
* module.cc (trees_out::type_node) <case TYPE_PACK_EXPANSION>:
Stream PACK_EXPANSION_EXTRA_ARGS.
(trees_in::tree_node) <case TYPE_PACK_EXPANSION>: Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/modules/pr106761.h: New test.
* g++.dg/modules/pr106761_a.H: New test.
* g++.dg/modules/pr106761_b.C: New test.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/module.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 1a1ff5b..9a9ef4e 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -8922,6 +8922,7 @@ trees_out::type_node (tree type) if (streaming_p ()) u (PACK_EXPANSION_LOCAL_P (type)); tree_node (PACK_EXPANSION_PARAMETER_PACKS (type)); + tree_node (PACK_EXPANSION_EXTRA_ARGS (type)); break; case TYPENAME_TYPE: @@ -9455,12 +9456,14 @@ trees_in::tree_node (bool is_use) { bool local = u (); tree param_packs = tree_node (); + tree extra_args = tree_node (); if (!get_overrun ()) { tree expn = cxx_make_type (TYPE_PACK_EXPANSION); SET_TYPE_STRUCTURAL_EQUALITY (expn); PACK_EXPANSION_PATTERN (expn) = res; PACK_EXPANSION_PARAMETER_PACKS (expn) = param_packs; + PACK_EXPANSION_EXTRA_ARGS (expn) = extra_args; PACK_EXPANSION_LOCAL_P (expn) = local; res = expn; } |