From: Jason Merrill <jason@redhat.com>
Date: Thu, 28 Mar 2013 18:20:51 +0000 (-0400)
Subject: re PR c++/56701 ([C++11] The *this* pointer fails to bind to rvalue reference to... 
X-Git-Tag: releases/gcc-4.9.0~6790
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=374b2837482811e9d5a2ec4b2db0dabd67e6d420;p=thirdparty%2Fgcc.git

re PR c++/56701 ([C++11] The *this* pointer fails to bind to rvalue reference to pointer type)

	PR c++/56701
	* semantics.c (finish_this_expr): 'this' is an rvalue.
	* typeck.c (cp_build_indirect_ref): Handle NOP_EXPR of 'this'.

From-SVN: r197212
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2b02880c63f0..b0a952a741cf 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2013-03-28  Jason Merrill  <jason@redhat.com>
 
+	PR c++/56701
+	* semantics.c (finish_this_expr): 'this' is an rvalue.
+	* typeck.c (cp_build_indirect_ref): Handle NOP_EXPR of 'this'.
+
 	PR c++/56710
 	* semantics.c (finish_member_declaration): Don't push closure
 	members.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index ad1c209b2362..2fe2908bf861 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2297,7 +2297,6 @@ finish_this_expr (void)
         result = lambda_expr_this_capture (CLASSTYPE_LAMBDA_EXPR (type));
       else
         result = current_class_ptr;
-
     }
   else if (current_function_decl
 	   && DECL_STATIC_FUNCTION_P (current_function_decl))
@@ -2314,6 +2313,9 @@ finish_this_expr (void)
       result = error_mark_node;
     }
 
+  /* The keyword 'this' is a prvalue expression.  */
+  result = rvalue (result);
+
   return result;
 }
 
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 4b6468ce6952..90c7ce495051 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -2843,7 +2843,11 @@ cp_build_indirect_ref (tree ptr, ref_operator errorstring,
 {
   tree pointer, type;
 
-  if (ptr == current_class_ptr)
+  if (ptr == current_class_ptr
+      || (TREE_CODE (ptr) == NOP_EXPR
+	  && TREE_OPERAND (ptr, 0) == current_class_ptr
+	  && (same_type_ignoring_top_level_qualifiers_p
+	      (TREE_TYPE (ptr), TREE_TYPE (current_class_ptr)))))
     return current_class_ref;
 
   pointer = (TREE_CODE (TREE_TYPE (ptr)) == REFERENCE_TYPE
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-this.C b/gcc/testsuite/g++.dg/cpp0x/rv-this.C
new file mode 100644
index 000000000000..8064a51d44f1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-this.C
@@ -0,0 +1,7 @@
+// PR c++/56701
+// { dg-require-effective-target c++11 }
+
+struct A
+{
+  void f(){ A*&& a = this; }
+};