public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-8761] c++: fn parm pack expansion inside constraint [PR100138]
@ 2021-07-16 22:49 Patrick Palka
  0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2021-07-16 22:49 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:2e63d08cb9bc001232734eed32e4bc3814a279a9

commit r11-8761-g2e63d08cb9bc001232734eed32e4bc3814a279a9
Author: Patrick Palka <ppalka@redhat.com>
Date:   Mon May 10 22:33:04 2021 -0400

    c++: fn parm pack expansion inside constraint [PR100138]
    
    This PR is about CTAD but the underlying problems are more general;
    CTAD is a good trigger for them because of the necessary substitution
    into constraints that deduction guide generation entails.
    
    In the testcase below, when generating the implicit deduction guide for
    the constrained constructor template for A, we substitute the generic
    flattening map 'tsubst_args' into the constructor's constraints.  During
    this substitution, tsubst_pack_expansion returns a rebuilt pack
    expansion for sizeof...(xs), but doesn't carry over the
    PACK_EXPANSION_LOCAL_P (and PACK_EXPANSION_SIZEOF_P) flag from the
    original tree to the rebuilt one.  The flag is otherwise unset on the
    original tree but gets set for the rebuilt tree from make_pack_expansion
    since at_function_scope_p() is true (we're inside main).  This leads to
    a crash during satisfaction when substituting into the pack expansion
    because we don't have local_specializations set up (and it'd be set up
    for us if PACK_EXPANSION_LOCAL_P is unset)
    
    Similarly, tsubst_constraint needs to set cp_unevaluated so that the
    substitution performed therein doesn't rely on local_specializations.
    This avoids a crash during CTAD for C below.
    
    gcc/cp/ChangeLog:
    
            PR c++/100138
            * constraint.cc (tsubst_constraint): Set up cp_unevaluated.
            (satisfy_atom): Set up iloc_sentinel before calling
            cxx_constant_value.
            * pt.c (tsubst_pack_expansion): When returning a rebuilt pack
            expansion, carry over PACK_EXPANSION_LOCAL_P and
            PACK_EXPANSION_SIZEOF_P from the original pack expansion.
    
    gcc/testsuite/ChangeLog:
    
            PR c++/100138
            * g++.dg/cpp2a/concepts-ctad4.C: New test.
    
    (cherry picked from commit e7a9f085ffd34b0d7bc4b803c182b41494f609aa)

Diff:
---
 gcc/cp/constraint.cc                        |  6 +++++-
 gcc/cp/pt.c                                 |  2 ++
 gcc/testsuite/g++.dg/cpp2a/concepts-ctad4.C | 25 +++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 27e22d52939..4af7018f1a5 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -2748,6 +2748,7 @@ tsubst_constraint (tree t, tree args, tsubst_flags_t complain, tree in_decl)
   /* We also don't want to evaluate concept-checks when substituting the
      constraint-expressions of a declaration.  */
   processing_constraint_expression_sentinel s;
+  cp_unevaluated u;
   tree expr = tsubst_expr (t, args, complain, in_decl, false);
   return expr;
 }
@@ -3006,7 +3007,10 @@ satisfy_atom (tree t, tree args, sat_info info)
 
   /* Compute the value of the constraint.  */
   if (info.noisy ())
-    result = cxx_constant_value (result);
+    {
+      iloc_sentinel ils (EXPR_LOCATION (result));
+      result = cxx_constant_value (result);
+    }
   else
     {
       result = maybe_constant_value (result, NULL_TREE,
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 072901d4eb9..b53b1fd9a97 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13186,6 +13186,8 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain,
       else
 	result = tsubst (pattern, args, complain, in_decl);
       result = make_pack_expansion (result, complain);
+      PACK_EXPANSION_LOCAL_P (result) = PACK_EXPANSION_LOCAL_P (t);
+      PACK_EXPANSION_SIZEOF_P (result) = PACK_EXPANSION_SIZEOF_P (t);
       if (PACK_EXPANSION_AUTO_P (t))
 	{
 	  /* This is a fake auto... pack expansion created in add_capture with
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ctad4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ctad4.C
new file mode 100644
index 00000000000..4f04cb3f43b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ctad4.C
@@ -0,0 +1,25 @@
+// PR c++/100138
+// { dg-do compile { target c++20 } }
+
+template <class T>
+struct A {
+  A(T, auto... xs) requires (sizeof...(xs) != 0);
+};
+
+constexpr bool f(...) { return true; }
+
+template <class T>
+struct B {
+  B(T, auto... xs) requires (f(xs...)); // { dg-error "constant expression" }
+};
+
+template <class T>
+struct C {
+  C(T, auto x) requires (f(x)); // { dg-error "constant expression" }
+};
+
+int main() {
+  A x{1, 2}; // { dg-bogus "" }
+  B y{1, 2}; // { dg-error "deduction|no match" }
+  C z{1, 2}; // { dg-error "deduction|no match" }
+}


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-07-16 22:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-16 22:49 [gcc r11-8761] c++: fn parm pack expansion inside constraint [PR100138] Patrick Palka

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).