/cp

2018-04-18 Paolo Carlini <paolo.carlini@oracle.com> PR c++/84630 * pt.c (tsubst_lambda_expr): Check begin_lambda_type return value for error_mark_node. /testsuite 2018-04-18 Paolo Carlini <paolo.carlini@oracle.com> PR c++/84630 * g++.dg/cpp0x/pr84630.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@259460 138bc75d-0d04-0410-961f-82ee72b054a4
githjh · Apr 18, 2018 · dc20975 · dc20975
1 parent f57e456
commit dc20975
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84630
+	* pt.c (tsubst_lambda_expr): Check begin_lambda_type return value
+	for error_mark_node.
+
 2018-04-18  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/84463

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
@@ -17570,6 +17570,8 @@ tsubst_lambda_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl)
     }
 
   tree type = begin_lambda_type (r);
+  if (type == error_mark_node)
+    return error_mark_node;
 
   /* Do this again now that LAMBDA_EXPR_EXTRA_SCOPE is set.  */
   determine_visibility (TYPE_NAME (type));

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84630
+	* g++.dg/cpp0x/pr84630.C: New.
+
 2018-04-18  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/84463

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr84630.C b/gcc/testsuite/g++.dg/cpp0x/pr84630.C
@@ -0,0 +1,7 @@
+// PR c++/84630
+// { dg-do compile { target c++11 } }
+
+template <typename...> struct c {
+  template <int> __attribute__((noinline([] {}))) int b();  // { dg-error "wrong number of arguments" }
+};
+c<> a;