re PR c++/71465 (ICE on invalid C++ code (with duplicate base) on x86_64-linux-gnu...

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

	PR c++/71465
	Revert:
	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-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/71465
	* g++.dg/inherit/crash5.C: New.
	Revert:
	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: r237258

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 54c838bfeaa340865d7cc0ca5aa2925fed86b487..a94cebea7dc9937bf74071416effc85963726b70 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+2016-06-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/71465
+       Revert:
+       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-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * decl.c (maybe_deduce_size_from_array_init): Use

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 2fccc5acf01c6ec05dd38ee9647b12205c47a916..e01353d5dc1416437b627e49ac03797f9fa70a16 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -22050,8 +22050,9 @@ 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);
+  if (type && cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)
+      && !xref_basetypes (type, bases))
+    type = NULL_TREE;
 
  done:
   /* Leave the scope given by the nested-name-specifier.  We will

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 155dc1144fece78c2259cc74b518d23384e4ec70..b1ea45ada40a54fcba75d11df6e0486445099eeb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2016-06-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/71465
+       * g++.dg/inherit/crash5.C: New.
+       Revert:
+       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-09  Martin Liska  <mliska@suse.cz>
 
        * g++.dg/predict-loop-exit-1.C: Scan for a new dump format.

diff --git a/gcc/testsuite/g++.dg/inherit/crash5.C b/gcc/testsuite/g++.dg/inherit/crash5.C
index bce999ccbe5a40aef42d4883b6eca607fc666036..5a4002e0f8a443470577c396649603ff67d15c1b 100644 (file)
--- a/gcc/testsuite/g++.dg/inherit/crash5.C
+++ b/gcc/testsuite/g++.dg/inherit/crash5.C
@@ -1,10 +1,6 @@
-// PR c++/70202
+// PR c++/71465
 
-class A
-{
-  virtual void foo () { }
-};
-class B : public A, A { };  // { dg-error "duplicate base type" }
-
-B b1, &b2 = b1;
-A a = b2;
+struct A { virtual void foo () {} };
+struct B : virtual A {};
+struct C : virtual A {}; 
+struct D : C, B, C {};  // { dg-error "duplicate base type" }

diff --git a/gcc/testsuite/g++.dg/inherit/virtual1.C b/gcc/testsuite/g++.dg/inherit/virtual1.C
index 1199b815f569a24a2cef2765e0e766c105af810a..08bcbb143cfb0a0557f4286587d1ec7f40599bcd 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" }
+struct B : A, virtual A {};     // { dg-error "duplicate base|forward declaration" }
 
-struct C : A, B {};             // { dg-error "duplicate base" }
+struct C : A, B {};             // { dg-error "duplicate base|invalid use" }
 
-C c;
+C c;                            // { dg-error "aggregate" }