diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc index 302b266809fbeb60bbba0df2dd8e4b0741e441e5..2e83d24dfda0473643125b8e992b8d689d5c4814 100644 --- a/gcc/cp/constexpr.cc +++ b/gcc/cp/constexpr.cc @@ -5799,6 +5799,9 @@ cxx_fold_indirect_ref (const constexpr_ctx *ctx, location_t loc, tree type, more folding opportunities. */ auto canonicalize_obj_off = [] (tree& obj, tree& off) { while (TREE_CODE (obj) == COMPONENT_REF + /* We need to preserve union member accesses so that we can + later properly diagnose accessing the wrong member. */ + && TREE_CODE (TREE_TYPE (TREE_OPERAND (obj, 0))) == RECORD_TYPE && (tree_int_cst_sign_bit (off) || integer_zerop (off))) { tree field = TREE_OPERAND (obj, 1); diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-union8.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-union8.C new file mode 100644 index 0000000000000000000000000000000000000000..34c264944b68811f5816844dfdcdc9d40bc9c2f2 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-union8.C @@ -0,0 +1,8 @@ +// PR c++/114709 +// { dg-do compile { target c++11 } } + +struct T1 { int a, b; }; +struct T2 { int c; double d; }; +union U { T1 t1; T2 t2; }; + +constexpr int v = U{{1,2}}.t2.*&T2::c; // { dg-error "accessing 'U::t2'" }