From: Jason Merrill <jason@redhat.com>
Date: Tue, 9 Aug 2016 14:08:33 +0000 (-0400)
Subject: PR c++/56701 - wrong type of &*this
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=23f4e590fb4ce718e58cd736c19d7e6959429500;p=gcc.git

PR c++/56701 - wrong type of &*this

	* typeck.c (cp_build_addr_expr_1): Remove special *this handling.

From-SVN: r239285
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1f032c7b81e..7b746ca67fe 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-09  Jason Merrill  <jason@redhat.com>
+
+	PR c++/56701
+	* typeck.c (cp_build_addr_expr_1): Remove special *this handling.
+
 2016-08-09  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/72809
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 78d443b1abf..bedc453a945 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -5626,11 +5626,6 @@ cp_build_addr_expr_1 (tree arg, bool strict_lvalue, tsubst_flags_t complain)
   /* Let &* cancel out to simplify resulting code.  */
   if (INDIRECT_REF_P (arg))
     {
-      /* We don't need to have `current_class_ptr' wrapped in a
-	 NON_LVALUE_EXPR node.  */
-      if (arg == current_class_ref)
-	return current_class_ptr;
-
       arg = TREE_OPERAND (arg, 0);
       if (TREE_CODE (TREE_TYPE (arg)) == REFERENCE_TYPE)
 	{
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-this2.C b/gcc/testsuite/g++.dg/cpp0x/rv-this2.C
new file mode 100644
index 00000000000..fcfd265d0d2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-this2.C
@@ -0,0 +1,8 @@
+// PR c++/56701
+// { dg-do compile { target c++11 } }
+
+struct A
+{
+  void f(){ A*&& a = &*this; }
+};
+int main(){}