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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 52400421d6419df7d1d982da0b2b0571f2866a53..c921f203ac993b34692be4988a2a5b864a9d9304 100644 (file)
--- 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 2a2cbf0f0610715d2afdadb40c7bbf29fa753ab8..4ef0f05c9bebd50f27ccf16b5d984dddaf671961 100644 (file)
--- 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 (file)
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" }
+}