]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
c++: Fix ICE with unexpanded parameter pack [PR99844]
authorMarek Polacek <polacek@redhat.com>
Wed, 7 Apr 2021 20:44:24 +0000 (16:44 -0400)
committerMarek Polacek <polacek@redhat.com>
Thu, 8 Apr 2021 11:44:44 +0000 (07:44 -0400)
In explicit17.C, we weren't detecting an unexpanded parameter pack in
explicit(bool), so we crashed on a TEMPLATE_PARM_INDEX in constexpr.

I noticed the same is true for noexcept(), but only since my patch to
implement delayed parsing of noexcept.  Previously, we would detect the
unexpanded pack in push_template_decl but now the noexcept expression
has not yet been parsed, so we need to do it a bit later.

gcc/cp/ChangeLog:

PR c++/99844
* decl.c (build_explicit_specifier): Call
check_for_bare_parameter_packs.
* except.c (build_noexcept_spec): Likewise.

gcc/testsuite/ChangeLog:

PR c++/99844
* g++.dg/cpp2a/explicit16.C: Use c++20.
* g++.dg/cpp0x/noexcept66.C: New test.
* g++.dg/cpp2a/explicit17.C: New test.

gcc/cp/decl.c
gcc/cp/except.c
gcc/testsuite/g++.dg/cpp0x/noexcept66.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp2a/explicit16.C
gcc/testsuite/g++.dg/cpp2a/explicit17.C [new file with mode: 0644]

index edab147c78d8941d39b8849f9c571b51b190e872..3294b4fa943c86136e94b75db1caa93c16e2dbb4 100644 (file)
@@ -17991,6 +17991,9 @@ require_deduced_type (tree decl, tsubst_flags_t complain)
 tree
 build_explicit_specifier (tree expr, tsubst_flags_t complain)
 {
+  if (check_for_bare_parameter_packs (expr))
+    return error_mark_node;
+
   if (instantiation_dependent_expression_p (expr))
     /* Wait for instantiation, tsubst_function_decl will handle it.  */
     return expr;
index 0bbc229490e5a07939003d75d0ed172f9781e16b..cbafc09629b8ddcf608579b9419e6f155506b69b 100644 (file)
@@ -1228,6 +1228,8 @@ type_throw_all_p (const_tree type)
 tree
 build_noexcept_spec (tree expr, tsubst_flags_t complain)
 {
+  if (check_for_bare_parameter_packs (expr))
+    return error_mark_node;
   if (TREE_CODE (expr) != DEFERRED_NOEXCEPT
       && !value_dependent_expression_p (expr))
     {
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept66.C b/gcc/testsuite/g++.dg/cpp0x/noexcept66.C
new file mode 100644 (file)
index 0000000..6c76d91
--- /dev/null
@@ -0,0 +1,13 @@
+// PR c++/99844
+// { dg-do compile { target c++11 } }
+
+template <bool... B>
+struct S {
+ void fn() noexcept(B); // { dg-error "parameter packs not expanded" }
+};
+
+void fn ()
+{
+  S<true> s;
+  s.fn();
+}
index 9d95b0d669e39d1206fb978cace4aa731b8b1490..9c20f6332e94b88060eecf9453666e6145c5b971 100644 (file)
@@ -1,5 +1,5 @@
 // PR c++/95066 - explicit malfunction with dependent expression.
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 template <typename T>
 struct Foo {
diff --git a/gcc/testsuite/g++.dg/cpp2a/explicit17.C b/gcc/testsuite/g++.dg/cpp2a/explicit17.C
new file mode 100644 (file)
index 0000000..38a61f4
--- /dev/null
@@ -0,0 +1,9 @@
+// PR c++/99844
+// { dg-do compile { target c++20 } }
+
+template <bool... B>
+struct S {
+  constexpr explicit(B) S() {} // { dg-error "parameter packs not expanded" }
+};
+
+constexpr S<true> s;