aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2013-12-23 23:22:15 -0500
committerJason Merrill <jason@gcc.gnu.org>2013-12-23 23:22:15 -0500
commit8fc13bad8e7c8f63aae7b0f58fe7e9a02ce11a29 (patch)
tree918bf18812ef06a8658e6552ec092146b294ddbf
parentfcccec56724fcd070c41acc3a10febf8febe0030 (diff)
downloadgcc-8fc13bad8e7c8f63aae7b0f58fe7e9a02ce11a29.zip
gcc-8fc13bad8e7c8f63aae7b0f58fe7e9a02ce11a29.tar.gz
gcc-8fc13bad8e7c8f63aae7b0f58fe7e9a02ce11a29.tar.bz2
re PR c++/59349 (ICE on invalid: Segmentation fault toplev.c:336)
PR c++/59349 * parser.c (cp_parser_lambda_introducer): Handle empty init. From-SVN: r206192
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/parser.c5
-rw-r--r--gcc/testsuite/g++.dg/cpp1y/lambda-init7.C6
3 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5240042..c921f203 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-23 Jason Merrill <jason@redhat.com>
+
+ PR c++/59349
+ * parser.c (cp_parser_lambda_introducer): Handle empty init.
+
2013-12-23 Stuart Hastings <stuart@apple.com>
Bill Maddox <maddox@google.com>
Jason Merrill <jason@redhat.com>
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 2a2cbf0..4ef0f05 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -8898,6 +8898,11 @@ cp_parser_lambda_introducer (cp_parser* parser, tree lambda_expr)
capture_init_expr = cp_parser_initializer (parser, &direct,
&non_constant);
explicit_init_p = true;
+ if (capture_init_expr == NULL_TREE)
+ {
+ error ("empty initializer for lambda init-capture");
+ capture_init_expr = error_mark_node;
+ }
}
else
{
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-init7.C b/gcc/testsuite/g++.dg/cpp1y/lambda-init7.C
new file mode 100644
index 0000000..ad152cf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-init7.C
@@ -0,0 +1,6 @@
+// PR c++/59349
+// { dg-options "-std=c++1y" }
+
+int foo () {
+ [bar()]{}; // { dg-error "empty initializer" }
+}