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 r12-8110] c++: requires-expr in pack expansion using pack [PR103105]
Date: Tue, 12 Apr 2022 16:59:24 +0000 (GMT)	[thread overview]
Message-ID: <20220412165924.0E71D3858D28@sourceware.org> (raw)

https://gcc.gnu.org/g:e2c7070ac7740508a7c49bfee9f895e216a272d6

commit r12-8110-ge2c7070ac7740508a7c49bfee9f895e216a272d6
Author: Patrick Palka <ppalka@redhat.com>
Date:   Tue Apr 12 12:58:18 2022 -0400

    c++: requires-expr in pack expansion using pack [PR103105]
    
    Here after dependent substitution of {Ts...} into the alias 'wrap',
    since we never partially instantiate a requires-expr, we end up with a
    requires-expr whose REQUIRES_EXPR_EXTRA_ARGS contains an
    ARGUMENT_PACK_SELECT (which just resolves to the parameter pack Ts).
    Then when hashing the resulting dependent specialization of A, we crash
    from iterative_hash_template_arg since it deliberately doesn't handle
    ARGUMENT_PACK_SELECT.
    
    Like in r12-7102-gdb5f1c17031ad8, it seems the right fix here is to
    resolve ARGUMENT_PACK_SELECT arguments before storing them into an
    extra args tree (such as REQUIRES_EXPR).
    
            PR c++/103105
    
    gcc/cp/ChangeLog:
    
            * pt.cc (build_extra_args): Call preserve_args.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/cpp2a/concepts-requires29.C: New test.
            * g++.dg/cpp2a/concepts-requires29a.C: New test.

Diff:
---
 gcc/cp/pt.cc                                      |  2 +-
 gcc/testsuite/g++.dg/cpp2a/concepts-requires29.C  | 18 ++++++++++++++++++
 gcc/testsuite/g++.dg/cpp2a/concepts-requires29a.C | 23 +++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 78519562953..84712e6fc2f 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -13048,7 +13048,7 @@ build_extra_args (tree pattern, tree args, tsubst_flags_t complain)
 {
   /* Make a copy of the extra arguments so that they won't get changed
      out from under us.  */
-  tree extra = copy_template_args (args);
+  tree extra = preserve_args (copy_template_args (args), /*cow_p=*/false);
   if (local_specializations)
     if (tree locals = extract_local_specs (pattern, complain))
       extra = tree_cons (NULL_TREE, extra, locals);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires29.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires29.C
new file mode 100644
index 00000000000..2cf69433d99
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires29.C
@@ -0,0 +1,18 @@
+// PR c++/103105
+// { dg-do compile { target c++20 } }
+
+template<bool> struct A;
+
+template<class... Ts>
+using wrap = A<1 != (0 + ... + requires { Ts(); })>;
+
+template<class... Ts> using type = wrap<Ts...>;
+
+using ty0 = type<>;
+using ty0 = A<true>;
+
+using ty1 = type<int>;
+using ty1 = A<false>;
+
+using ty2 = type<int, int>;
+using ty2 = A<true>;
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires29a.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires29a.C
new file mode 100644
index 00000000000..84c226918f5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires29a.C
@@ -0,0 +1,23 @@
+// PR c++/103105
+// { dg-do compile { target c++20 } }
+
+template<class...> struct list;
+
+template<bool> struct A;
+
+template<class T, class... Ts>
+using wrap = A<1 != (0 + ... + requires { T() = Ts(); })>;
+
+template<class... Ts> using type = list<wrap<Ts, Ts...>...>;
+
+using ty0 = type<>;
+using ty0 = list<>;
+
+using ty1 = type<int>;
+using ty1 = list<A<true>>;
+
+using ty2 = type<int, int>;
+using ty2 = list<A<true>, A<true>>;
+
+using ty3 = type<int, int, int>;
+using ty3 = list<A<true>, A<true>, A<true>>;


                 reply	other threads:[~2022-04-12 16:59 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=20220412165924.0E71D3858D28@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: link
Be 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).