From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 31 Jan 2014 16:22:53 +0000 (+0000)
Subject: /cp
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ed7b5b0142a7be70332347fb5547893c7bbcf33;p=thirdparty%2Fgcc.git

/cp
2014-01-31  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/59082
	* class.c (build_vfield_ref): Early return error_mark_node if
	TYPE_VFIELD (type) is null.
	(build_base_path): Check return value of build_vfield_ref.

/testsuite
2014-01-31  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/59082
	* g++.dg/inherit/crash4.C: New.


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1fd5a6808d85..0909bf144171 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-31  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/59082
+	* class.c (build_vfield_ref): Early return error_mark_node if
+	TYPE_VFIELD (type) is null.
+	(build_base_path): Check return value of build_vfield_ref.
+
 2014-01-31  Jason Merrill  <jason@redhat.com>
 
 	PR c++/59646
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 0c3ce47bc756..97a1cc27855c 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -431,6 +431,9 @@ build_base_path (enum tree_code code,
 	v_offset = build_vfield_ref (cp_build_indirect_ref (expr, RO_NULL,
                                                             complain),
 				     TREE_TYPE (TREE_TYPE (expr)));
+      
+      if (v_offset == error_mark_node)
+	return error_mark_node;
 
       v_offset = fold_build_pointer_plus (v_offset, BINFO_VPTR_FIELD (v_binfo));
       v_offset = build1 (NOP_EXPR,
@@ -625,7 +628,9 @@ build_vfield_ref (tree datum, tree type)
 {
   tree vfield, vcontext;
 
-  if (datum == error_mark_node)
+  if (datum == error_mark_node
+      /* Can happen in case of duplicate base types (c++/59082).  */
+      || !TYPE_VFIELD (type))
     return error_mark_node;
 
   /* First, convert to the requested type.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c81b82d2dc56..fca54d7cd30f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,10 @@
+2014-01-31  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/59082
+	* g++.dg/inherit/crash4.C: New.
+
 2014-01-31  Maxim Ostapenko  <m.ostapenko@partner.samsung.com>
+
 	* c-c++-common/tsan/simple_race.c: Made test less flaky.
 
 2014-01-31  Ilya Tocar  <ilya.tocar@intel.com>
diff --git a/gcc/testsuite/g++.dg/inherit/crash4.C b/gcc/testsuite/g++.dg/inherit/crash4.C
new file mode 100644
index 000000000000..b5b02f101925
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/crash4.C
@@ -0,0 +1,10 @@
+// PR c++/59082
+
+struct A {};
+
+struct B : virtual A, A {};  // { dg-error "duplicate base type" }
+
+A foo(const B &b)
+{
+  return b;
+}