diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/tree.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C | 28 |
2 files changed, 33 insertions, 9 deletions
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index fec5afa..297da2b 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3242,15 +3242,11 @@ bot_replace (tree* t, int* /*walk_subtrees*/, void* data_) else if (TREE_CODE (*t) == CONVERT_EXPR && CONVERT_EXPR_VBASE_PATH (*t)) { - /* In an NSDMI build_base_path defers building conversions to virtual - bases, and we handle it here. */ - tree basetype = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (*t))); - vec<tree, va_gc> *vbases = CLASSTYPE_VBASECLASSES (current_class_type); - int i; tree binfo; - FOR_EACH_VEC_SAFE_ELT (vbases, i, binfo) - if (BINFO_TYPE (binfo) == basetype) - break; - *t = build_base_path (PLUS_EXPR, TREE_OPERAND (*t, 0), binfo, true, + /* In an NSDMI build_base_path defers building conversions to morally + virtual bases, and we handle it here. */ + tree basetype = TREE_TYPE (*t); + *t = convert_to_base (TREE_OPERAND (*t, 0), basetype, + /*check_access=*/false, /*nonnull=*/true, tf_warning_or_error); } diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C new file mode 100644 index 0000000..dc847cc --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C @@ -0,0 +1,28 @@ +// PR c++/80431 +// { dg-do run { target c++11 } } + +// A variant of nsdmi-virtual1.C where A is only a morally virtual base of B. + +struct A +{ + A(): i(42) { } + int i; + int f() { return i; } +}; + +struct D : A { int pad; }; + +struct B : virtual D +{ + int j = i + f(); + int k = A::i + A::f(); +}; + +struct C: B { int pad; }; + +int main() +{ + C c; + if (c.j != 84 || c.k != 84) + __builtin_abort(); +} |