From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 20 May 2010 19:31:47 +0000 (+0000)
Subject: /cp
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=976d38860d53e2fc538d130de111346d5e62682f;p=thirdparty%2Fgcc.git

/cp
2010-05-20  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/30298
	* decl.c (xref_basetypes): Return false in case of ill-formed
	redefinition.

/testsuite
2010-05-20  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/30298
	* g++.dg/inherit/crash1.C: New.
	* g++.dg/inherit/crash2.C: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159637 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 68d461e72bb0..8e6cd75ca0c3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-20  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/30298
+	* decl.c (xref_basetypes): Return false in case of ill-formed
+	redefinition.
+
 2010-05-19  Jason Merrill  <jason@redhat.com>
 
 	* call.c (reference_binding): Use cp_build_qualified_type_real
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 43a6bc3d4a0b..95ae8ebbe0fa 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11025,7 +11025,12 @@ xref_basetypes (tree ref, tree base_list)
 
   /* The binfo slot should be empty, unless this is an (ill-formed)
      redefinition.  */
-  gcc_assert (!TYPE_BINFO (ref) || TYPE_SIZE (ref));
+  if (TYPE_BINFO (ref) && !TYPE_SIZE (ref))
+    {
+      error ("redefinition of %q#T", ref);
+      return false;
+    }
+
   gcc_assert (TYPE_MAIN_VARIANT (ref) == ref);
 
   binfo = make_tree_binfo (max_bases);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d50e8baf8def..d4c10f3af460 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-20  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/30298
+	* g++.dg/inherit/crash1.C: New.
+	* g++.dg/inherit/crash2.C: Likewise.
+
 2010-05-20  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/44178
@@ -6,7 +12,8 @@
 2010-05-20  Changpeng Fang  <changpeng.fang@amd.com>
 
 	PR middle-end/44185
-	* gcc.dg/tree-ssa/prefetch-6.c: Add --param min-insn-to-prefetch-ratio=6.
+	* gcc.dg/tree-ssa/prefetch-6.c: Add
+	--param min-insn-to-prefetch-ratio=6.
 	* gcc.dg/tree-ssa/prefetch-7.c: Remove --param max-unrolled-insns=1 to
         allow unrolling, and adjust the movnti count.
 
diff --git a/gcc/testsuite/g++.dg/inherit/crash1.C b/gcc/testsuite/g++.dg/inherit/crash1.C
new file mode 100644
index 000000000000..d5eb7c26aedd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/crash1.C
@@ -0,0 +1,6 @@
+// PR c++/30298
+
+union A {};
+
+struct B : A {}; // { dg-error "fails to be a struct or class type" }
+struct B : A {}; // { dg-error "redefinition" }
diff --git a/gcc/testsuite/g++.dg/inherit/crash2.C b/gcc/testsuite/g++.dg/inherit/crash2.C
new file mode 100644
index 000000000000..0d82f773e67d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/crash2.C
@@ -0,0 +1,6 @@
+// PR c++/30298
+
+struct A {};
+
+struct B : A, A {}; // { dg-error "duplicate base type" }
+struct B : A, A {}; // { dg-error "redefinition" }