diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8bddaf2dfa4..0c5bcee6ebe 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-03-26 Jason Merrill + + PR c++/45282 + * typeck2.c (build_m_component_ref): Handle prvalue object. + 2013-03-26 Gabriel Dos Reis * cp-gimplify.c (cp_genericize_r): Use VAR_OR_FUNCTION_DECL_P. diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index ca31610d66b..72dccb4f067 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1671,7 +1671,7 @@ build_m_component_ref (tree datum, tree component, tsubst_flags_t complain) if (TYPE_PTRDATAMEM_P (ptrmem_type)) { - bool is_lval = real_lvalue_p (datum); + cp_lvalue_kind kind = lvalue_kind (datum); tree ptype; /* Compute the type of the field, as described in [expr.ref]. @@ -1701,7 +1701,9 @@ build_m_component_ref (tree datum, tree component, tsubst_flags_t complain) return error_mark_node; /* If the object expression was an rvalue, return an rvalue. */ - if (!is_lval) + if (kind & clk_class) + datum = rvalue (datum); + else if (kind & clk_rvalueref) datum = move (datum); return datum; } diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype49.C b/gcc/testsuite/g++.dg/cpp0x/decltype49.C new file mode 100644 index 00000000000..c3174982f82 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/decltype49.C @@ -0,0 +1,10 @@ +// PR c++/45282 +// { dg-require-effective-target c++11 } + +struct A { int i; }; +int A::*ipm = &A::i; + +template class assert_same_type; +template class assert_same_type { }; + +assert_same_type x2;