From: Jason Merrill <jason@redhat.com>
Date: Tue, 14 Jun 2011 18:15:58 +0000 (-0400)
Subject: re PR c++/49389 ([C++0x] Wrong value category for pointer-to-member expression with... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0171567edce496309e2a364e563b7cf066923918;p=gcc.git

re PR c++/49389 ([C++0x] Wrong value category for pointer-to-member expression with rvalue object expression)

	PR c++/49389
	* typeck2.c (build_m_component_ref): Preserve rvalueness.

From-SVN: r175043
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a6c866567b8..5970440731f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-14  Jason Merrill  <jason@redhat.com>
 
+	PR c++/49389
+	* typeck2.c (build_m_component_ref): Preserve rvalueness.
+
 	PR c++/49369
 	* class.c (build_base_path): Fix cv-quals in unevaluated context.
 
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index fa64d1d7253..d72f57ec937 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1551,6 +1551,7 @@ build_m_component_ref (tree datum, tree component)
 
   if (TYPE_PTRMEM_P (ptrmem_type))
     {
+      bool is_lval = real_lvalue_p (datum);
       tree ptype;
 
       /* Compute the type of the field, as described in [expr.ref].
@@ -1573,7 +1574,11 @@ build_m_component_ref (tree datum, tree component)
       datum = build2 (POINTER_PLUS_EXPR, ptype,
 		      fold_convert (ptype, datum),
 		      build_nop (sizetype, component));
-      return cp_build_indirect_ref (datum, RO_NULL, tf_warning_or_error);
+      datum = cp_build_indirect_ref (datum, RO_NULL, tf_warning_or_error);
+      /* If the object expression was an rvalue, return an rvalue.  */
+      if (!is_lval)
+	datum = move (datum);
+      return datum;
     }
   else
     return build2 (OFFSET_REF, type, datum, component);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7d5e46ae7c8..1ca37e3490d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-14  Jason Merrill  <jason@redhat.com>
 
+	PR c++/49389
+	* g++.dg/cpp0x/rv-dotstar.C: New.
+
 	PR c++/49369
 	* g++.dg/cpp0x/decltype30.C: New.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-dotstar.C b/gcc/testsuite/g++.dg/cpp0x/rv-dotstar.C
new file mode 100644
index 00000000000..65aac8da2a1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-dotstar.C
@@ -0,0 +1,13 @@
+// PR c++/49389
+// { dg-options -std=c++0x }
+
+template<class T> T&& val();
+
+struct A {};
+
+typedef decltype(val<A>().*val<int A::*>()) type;
+
+template<class> struct assert_type;
+template<> struct assert_type<int&&> {};
+
+assert_type<type> test;