PR c++/80465 - ICE with generic lambda with noexcept-specifier.

	* lambda.c (maybe_add_lambda_conv_op): Keep processing_template_decl
	set longer for a generic lambda.

From-SVN: r249322

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 66dd04427003d0a4bc8aad0099a9c140761565ab..1ec3b2261ba889535ad2a3fa1c28c67ab500ba36 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2017-06-16  Jason Merrill  <jason@redhat.com>
 
+       PR c++/80465 - ICE with generic lambda with noexcept-specifier.
+       * lambda.c (maybe_add_lambda_conv_op): Keep processing_template_decl
+       set longer for a generic lambda.
+
        PR c++/80614 - Wrong mangling for C++17 noexcept type
        * mangle.c (write_type): Put the eh spec back on the function type.
 

diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index ee8784cb6adabd5fcba17d0ff98cf5d1de5fd07b..41d4921c1db49fd7a05b3135a074b2ccf30b0757 100644 (file)
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -987,6 +987,8 @@ maybe_add_lambda_conv_op (tree type)
                            null_pointer_node);
   if (generic_lambda_p)
     {
+      ++processing_template_decl;
+
       /* Prepare the dependent member call for the static member function
         '_FUN' and, potentially, prepare another call to be used in a decltype
         return expression for a deduced return call op to allow for simple
@@ -1036,9 +1038,7 @@ maybe_add_lambda_conv_op (tree type)
 
        if (generic_lambda_p)
          {
-           ++processing_template_decl;
            tree a = forward_parm (tgt);
-           --processing_template_decl;
 
            CALL_EXPR_ARG (call, ix) = a;
            if (decltype_call)
@@ -1062,11 +1062,9 @@ maybe_add_lambda_conv_op (tree type)
     {
       if (decltype_call)
        {
-         ++processing_template_decl;
          fn_result = finish_decltype_type
            (decltype_call, /*id_expression_or_member_access_p=*/false,
             tf_warning_or_error);
-         --processing_template_decl;
        }
     }
   else
@@ -1084,6 +1082,9 @@ maybe_add_lambda_conv_op (tree type)
       && TYPE_NOTHROW_P (TREE_TYPE (callop)))
     stattype = build_exception_variant (stattype, noexcept_true_spec);
 
+  if (generic_lambda_p)
+    --processing_template_decl;
+
   /* First build up the conversion op.  */
 
   tree rettype = build_pointer_type (stattype);

diff --git a/gcc/testsuite/g++.dg/cpp1z/noexcept-type17.C b/gcc/testsuite/g++.dg/cpp1z/noexcept-type17.C
new file mode 100644 (file)
index 0000000..46aefdd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/noexcept-type17.C
@@ -0,0 +1,7 @@
+// PR c++/80465
+// { dg-options -std=c++1z }
+
+int foo(...);
+int main() {
+  [](auto a) noexcept(noexcept(foo(a))){}(42);
+}