aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2018-12-04 09:44:12 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2018-12-04 09:44:12 +0100
commit580b8d9b540761e4df47d22fbfc9372396db8748 (patch)
treeae816e7bce27a5c49e457b707e062410154eb296 /gcc/cp
parent056775650ac086fb069e00415bf262e22f7579c5 (diff)
downloadgcc-580b8d9b540761e4df47d22fbfc9372396db8748.zip
gcc-580b8d9b540761e4df47d22fbfc9372396db8748.tar.gz
gcc-580b8d9b540761e4df47d22fbfc9372396db8748.tar.bz2
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
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/typeck.c8
2 files changed, 13 insertions, 1 deletions
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 <jakub@redhat.com>
+
+ 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 <jakub@redhat.com>
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