Commit f1f82a37 by Paolo Carlini Committed by Paolo Carlini

re PR c++/59082 (ICE with duplicate (virtual) base)

/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.

From-SVN: r207359
parent d66f9f0b
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> 2014-01-31 Jason Merrill <jason@redhat.com>
PR c++/59646 PR c++/59646
......
...@@ -431,6 +431,9 @@ build_base_path (enum tree_code code, ...@@ -431,6 +431,9 @@ build_base_path (enum tree_code code,
v_offset = build_vfield_ref (cp_build_indirect_ref (expr, RO_NULL, v_offset = build_vfield_ref (cp_build_indirect_ref (expr, RO_NULL,
complain), complain),
TREE_TYPE (TREE_TYPE (expr))); 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 = fold_build_pointer_plus (v_offset, BINFO_VPTR_FIELD (v_binfo));
v_offset = build1 (NOP_EXPR, v_offset = build1 (NOP_EXPR,
...@@ -625,7 +628,9 @@ build_vfield_ref (tree datum, tree type) ...@@ -625,7 +628,9 @@ build_vfield_ref (tree datum, tree type)
{ {
tree vfield, vcontext; 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; return error_mark_node;
/* First, convert to the requested type. */ /* First, convert to the requested type. */
......
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> 2014-01-31 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
* c-c++-common/tsan/simple_race.c: Made test less flaky. * c-c++-common/tsan/simple_race.c: Made test less flaky.
2014-01-31 Ilya Tocar <ilya.tocar@intel.com> 2014-01-31 Ilya Tocar <ilya.tocar@intel.com>
......
// PR c++/59082
struct A {};
struct B : virtual A, A {}; // { dg-error "duplicate base type" }
A foo(const B &b)
{
return b;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment