diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2014-01-31 16:22:53 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-01-31 16:22:53 +0000 |
| commit | f1f82a37ae52962a086ab9ae516a1360d03a9b56 (patch) | |
| tree | 1fa8cac5b1ff6f7af620178e72f5ffe5da23a353 | |
| parent | d66f9f0b1a6139c8871a5a359167c078eb1293e6 (diff) | |
| download | gcc-f1f82a37ae52962a086ab9ae516a1360d03a9b56.zip gcc-f1f82a37ae52962a086ab9ae516a1360d03a9b56.tar.gz gcc-f1f82a37ae52962a086ab9ae516a1360d03a9b56.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/class.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/inherit/crash4.C | 10 |
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1fd5a68..0909bf1 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 0c3ce47..97a1cc2 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 c81b82d..fca54d7 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 0000000..b5b02f1 --- /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; +} |