public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Patrick Palka <ppalka@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2735] c++: stream PACK_EXPANSION_EXTRA_ARGS [PR106761] Date: Tue, 20 Sep 2022 14:21:19 +0000 (GMT) [thread overview] Message-ID: <20220920142119.8D7953858D38@sourceware.org> (raw) https://gcc.gnu.org/g:84b2ab97e412d9514730db335a795c7db2fb42cc commit r13-2735-g84b2ab97e412d9514730db335a795c7db2fb42cc Author: Patrick Palka <ppalka@redhat.com> Date: Tue Sep 20 10:19:30 2022 -0400 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. Diff: --- gcc/cp/module.cc | 3 +++ gcc/testsuite/g++.dg/modules/pr106761.h | 22 ++++++++++++++++++++++ gcc/testsuite/g++.dg/modules/pr106761_a.H | 5 +++++ gcc/testsuite/g++.dg/modules/pr106761_b.C | 7 +++++++ 4 files changed, 37 insertions(+) diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 1a1ff5be574..9a9ef4e3332 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; } diff --git a/gcc/testsuite/g++.dg/modules/pr106761.h b/gcc/testsuite/g++.dg/modules/pr106761.h new file mode 100644 index 00000000000..9f22a22a45d --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr106761.h @@ -0,0 +1,22 @@ +// PR c++/106761 + +template<class...> +struct __and_; + +template<class, class> +struct is_convertible; + +template<class... Ts> +struct _TupleConstraints { + template<class... Us> + using __constructible = __and_<is_convertible<Ts, Us>...>; +}; + +template<class... Ts> +struct tuple { + template<class... Us> + using __constructible + = typename _TupleConstraints<Ts...>::template __constructible<Us...>; +}; + +tuple<int, int> t; diff --git a/gcc/testsuite/g++.dg/modules/pr106761_a.H b/gcc/testsuite/g++.dg/modules/pr106761_a.H new file mode 100644 index 00000000000..8ad116412af --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr106761_a.H @@ -0,0 +1,5 @@ +// PR c++/106761 +// { dg-additional-options -fmodule-header } + +// { dg-module-cmi {} } +#include "pr106761.h" diff --git a/gcc/testsuite/g++.dg/modules/pr106761_b.C b/gcc/testsuite/g++.dg/modules/pr106761_b.C new file mode 100644 index 00000000000..418991b1874 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr106761_b.C @@ -0,0 +1,7 @@ +// PR c++/106761 +// { dg-additional-options -fmodules-ts } + +#include "pr106761.h" +import "pr106761_a.H"; + +tuple<int, int> u = t;
reply other threads:[~2022-09-20 14:21 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220920142119.8D7953858D38@sourceware.org \ --to=ppalka@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).