From 580b8d9b540761e4df47d22fbfc9372396db8748 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 4 Dec 2018 09:44:12 +0100 Subject: re PR c++/88103 (Wrong value category when conditional expression result is used as object expression) PR c++/88103 * typeck.c (build_class_member_access_expr): If unary_complex_lvalue turned xvalue_p into non-xvalue_p, call move on it. * g++.dg/cpp0x/rv-cond3.C: New test. From-SVN: r266772 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/typeck.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 02f08ab..48f802b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-12-04 Jakub Jelinek + + PR c++/88103 + * typeck.c (build_class_member_access_expr): If unary_complex_lvalue + turned xvalue_p into non-xvalue_p, call move on it. + 2018-12-02 Jakub Jelinek PR c++/88258 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index f45c06e..86c95d7 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -2422,7 +2422,13 @@ build_class_member_access_expr (cp_expr object, tree member, { tree temp = unary_complex_lvalue (ADDR_EXPR, object); if (temp) - object = cp_build_fold_indirect_ref (temp); + { + temp = cp_build_fold_indirect_ref (temp); + if (xvalue_p (object) && !xvalue_p (temp)) + /* Preserve xvalue kind. */ + temp = move (temp); + object = temp; + } } /* In [expr.ref], there is an explicit list of the valid choices for -- cgit v1.1