From ad409f798ecc83f1289caa30d48471a77752fc4e Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 14 Jul 2014 05:25:25 +0000
Subject: [PATCH] 	PR c++/58612 	* tree.c (bot_replace): Only replace a
 dummy 'this' parm.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212505 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                            |  3 +++
 gcc/cp/tree.c                               |  3 ++-
 gcc/testsuite/g++.dg/cpp0x/constexpr-neg3.C | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-neg3.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 45116eb70b3..63f68dc2bb2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2014-07-13  Jason Merrill  <jason@redhat.com>
 
+	PR c++/58612
+	* tree.c (bot_replace): Only replace a dummy 'this' parm.
+
 	PR c++/60628
 	* decl.c (create_array_type_for_decl): Only check for auto once.
 
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 7ff593564ca..e7823663f5e 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2353,7 +2353,8 @@ bot_replace (tree* t, int* /*walk_subtrees*/, void* data)
 	*t = (tree) n->value;
     }
   else if (TREE_CODE (*t) == PARM_DECL
-	   && DECL_NAME (*t) == this_identifier)
+	   && DECL_NAME (*t) == this_identifier
+	   && !DECL_CONTEXT (*t))
     {
       /* In an NSDMI we need to replace the 'this' parameter we used for
 	 parsing with the real one for this function.  */
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-neg3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-neg3.C
new file mode 100644
index 00000000000..55bb838a2bf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-neg3.C
@@ -0,0 +1,15 @@
+// PR c++/58612
+// { dg-do compile { target c++11 } }
+
+struct A
+{
+  int foo() const { return 0; }
+};
+
+template<typename> struct B
+{
+  A a;
+  constexpr int bar() { return a.foo(); } // { dg-error "foo" }
+};
+
+constexpr int i = B<void>().bar(); // { dg-error "bar" }
-- 
2.11.4.GIT