re PR c++/70202 (ICE on invalid code on x86_64-linux-gnu in build_simple_base_path...

/cp
2016-06-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/70202
	* parser.c (cp_parser_class_head): When xref_basetypes fails and
	emits an error do not zero the type.

/testsuite
2016-06-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/70202
	* g++.dg/inherit/crash5.C: New.
	* g++.dg/inherit/virtual1.C: Adjust.

From-SVN: r237089

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0569d842e54006ab7d53c0eb787a6d6b198cd8bf..b6c0c98310b21bf2ca1c9f676b5c423fbdabfcf1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/70202
+       * parser.c (cp_parser_class_head): When xref_basetypes fails and
+       emits an error do not zero the type.
+
 2016-06-03  Patrick Palka  <ppalka@gcc.gnu.org>
 
        PR c++/27100

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index e01353d5dc1416437b627e49ac03797f9fa70a16..2fccc5acf01c6ec05dd38ee9647b12205c47a916 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -22050,9 +22050,8 @@ cp_parser_class_head (cp_parser* parser,
 
   /* If we're really defining a class, process the base classes.
      If they're invalid, fail.  */
-  if (type && cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)
-      && !xref_basetypes (type, bases))
-    type = NULL_TREE;
+  if (type && cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
+    xref_basetypes (type, bases);
 
  done:
   /* Leave the scope given by the nested-name-specifier.  We will

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cd45cda0300eb9449f568bbb4084a4a40a67acc1..94b4a33dd41ed5aa46ba058e55cdd985deb306c1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/70202
+       * g++.dg/inherit/crash5.C: New.
+       * g++.dg/inherit/virtual1.C: Adjust.
+
 2016-06-03  Jeff Law  <law@redhat.com>
 
        PR tree-optimization/71316

diff --git a/gcc/testsuite/g++.dg/inherit/crash5.C b/gcc/testsuite/g++.dg/inherit/crash5.C
new file mode 100644 (file)
index 0000000..bce999c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/crash5.C
@@ -0,0 +1,10 @@
+// PR c++/70202
+
+class A
+{
+  virtual void foo () { }
+};
+class B : public A, A { };  // { dg-error "duplicate base type" }
+
+B b1, &b2 = b1;
+A a = b2;

diff --git a/gcc/testsuite/g++.dg/inherit/virtual1.C b/gcc/testsuite/g++.dg/inherit/virtual1.C
index 08bcbb143cfb0a0557f4286587d1ec7f40599bcd..1199b815f569a24a2cef2765e0e766c105af810a 100644 (file)
--- a/gcc/testsuite/g++.dg/inherit/virtual1.C
+++ b/gcc/testsuite/g++.dg/inherit/virtual1.C
@@ -5,8 +5,8 @@ struct A
     virtual ~A() {}
 };
 
-struct B : A, virtual A {};     // { dg-error "duplicate base|forward declaration" }
+struct B : A, virtual A {};     // { dg-error "duplicate base" }
 
-struct C : A, B {};             // { dg-error "duplicate base|invalid use" }
+struct C : A, B {};             // { dg-error "duplicate base" }
 
-C c;                            // { dg-error "aggregate" }
+C c;