re PR c++/39060 (ICE with lots of invalid member functions)

gcc/cp/

2009-03-08  H.J. Lu  <hongjiu.lu@intel.com>

	PR c++/39060
	* parser.c (cp_parser_late_parsing_default_args): Continue
	the loop when cp_parser_assignment_expression returns
	error_mark_node.

gcc/testsuite/

2009-03-08  H.J. Lu  <hongjiu.lu@intel.com>

	PR c++/39060
	* g++.dg/other/new1.C: Adjusted.
	* g++.dg/parse/crash40.C: Likewise.
	* g++.dg/parse/defarg12.C: Likewise.
	* g++.dg/template/error15.C: Likewise.

	* g++.dg/other/pr39060.C: New.

From-SVN: r144710

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 368843fd3a037762efed81d942254fc54d12f2b2..c4b151b79a8f7c1b0715e72480c4efca273b601e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR c++/39060
+       * parser.c (cp_parser_late_parsing_default_args): Continue
+       the loop when cp_parser_assignment_expression returns
+       error_mark_node.
+
 2009-03-07  Jason Merrill  <jason@redhat.com>
 
        PR c++/39367

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 5c5c912b5879b9a5f31c52062b4a42d9b540955b..4c6fd4a78c5969937ddfa8f953367c76a3d7439b 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -18291,6 +18291,11 @@ cp_parser_late_parsing_default_args (cp_parser *parser, tree fn)
 
       /* Parse the assignment-expression.  */
       parsed_arg = cp_parser_assignment_expression (parser, /*cast_p=*/false, NULL);
+      if (parsed_arg == error_mark_node)
+       {
+         cp_parser_pop_lexer (parser);
+         continue;
+       }
 
       if (!processing_template_decl)
        parsed_arg = check_default_argument (TREE_VALUE (parm), parsed_arg);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1b7a69d10e16e1c9482a5c764fd1d97d0160c8fe..3d44d641c2476d85644a68615987c5e5dc6696a0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR c++/39060
+       * g++.dg/other/new1.C: Adjusted.
+       * g++.dg/parse/crash40.C: Likewise.
+       * g++.dg/parse/defarg12.C: Likewise.
+       * g++.dg/template/error15.C: Likewise.
+
+       * g++.dg/other/pr39060.C: New.
+
 2009-03-07  Jason Merrill  <jason@redhat.com>
 
        PR c++/39367

diff --git a/gcc/testsuite/g++.dg/other/new1.C b/gcc/testsuite/g++.dg/other/new1.C
index 30b651326aa34787f86e6db914a6a328b51bed26..71383706ea4efc662ed34ac8f5bce3e15676b3b6 100644 (file)
--- a/gcc/testsuite/g++.dg/other/new1.C
+++ b/gcc/testsuite/g++.dg/other/new1.C
@@ -10,5 +10,5 @@ struct A
 
 void foo()
 {
-  new A;
+  new A;       // { dg-error "default argument" }
 }

diff --git a/gcc/testsuite/g++.dg/other/pr39060.C b/gcc/testsuite/g++.dg/other/pr39060.C
new file mode 100644 (file)
index 0000000..a625aea
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/pr39060.C
@@ -0,0 +1,19 @@
+// PR c++/39060
+// { dg-do compile }
+
+struct A
+{
+  A(void* i=); // { dg-error "with|specification" }
+  A(void* i=); // { dg-error "overloaded" }
+  A(void* i=); // { dg-error "overloaded" }
+
+  void operator+ (void* i=);   // { dg-error "arguments" }
+
+  virtual void foo1(=);        // { dg-error "identifier" }
+  void foo2(=);                // { dg-error "identifier" }
+  void foo3(=);                // { dg-error "identifier" }
+  void foo4(=);                // { dg-error "identifier" }
+  void foo5(=);                // { dg-error "identifier" }
+};     // { dg-error "primary-expression" }
+
+A::A (void* i=) {}     // { dg-error "primary-expression|argument" }

diff --git a/gcc/testsuite/g++.dg/parse/crash40.C b/gcc/testsuite/g++.dg/parse/crash40.C
index af44fdb695caf76be2728b1a94534b48b2dfe798..6a15228c0632c5e4767a169758bea0a5c1486825 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/crash40.C
+++ b/gcc/testsuite/g++.dg/parse/crash40.C
@@ -37,6 +37,6 @@ void bar()
   int i;
   i.C::foo<0>(); /* { dg-error "which is of non-class type" } */
 
-  S<false> s;
+  S<false> s; /* { dg-error "default argument" } */
   SS<false> ss; /* { dg-error "within this context" } */
 }

diff --git a/gcc/testsuite/g++.dg/parse/defarg12.C b/gcc/testsuite/g++.dg/parse/defarg12.C
index 3717ad5db7de778da4a75e62c21a688c021796b6..80ef5c38e1fc3d4448a39180c66c78dc53650aac 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/defarg12.C
+++ b/gcc/testsuite/g++.dg/parse/defarg12.C
@@ -9,5 +9,5 @@ struct A
 
 void foo()
 {
-  A().i;
+  A().i; /* { dg-error "default argument" } */
 }

diff --git a/gcc/testsuite/g++.dg/template/error15.C b/gcc/testsuite/g++.dg/template/error15.C
index 6bd1f77e874b392f057bd5c1cb4a39d0415f2519..b7c7bc8ca47da71d7c2641b59c6ab126d0218b26 100644 (file)
--- a/gcc/testsuite/g++.dg/template/error15.C
+++ b/gcc/testsuite/g++.dg/template/error15.C
@@ -18,7 +18,7 @@ protected:
 
 template <class T>
 void B<T>::g(void) {
-  f();
+  f(); // { dg-error "default argument" }
 }
 
 template class B<long>;