5 files changed, 37 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fe7589e9..59b162d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-26  Jason Merrill  <jason@redhat.com>
+
+	* pt.c (tsubst_copy) [PARM_DECL]: Handle 'this' in NSDMI.
+
 2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* pt.c (convert_nontype_argument): Handle NULLPTR_TYPE.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2c398e0..cac45f9 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -11750,6 +11750,13 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl)
       if (r == NULL)
 	{
 	  tree c;
+
+	  /* We get here for a use of 'this' in an NSDMI.  */
+	  if (DECL_NAME (t) == this_identifier
+	      && at_function_scope_p ()
+	      && DECL_CONSTRUCTOR_P (current_function_decl))
+	    return current_class_ptr;
+
 	  /* This can happen for a parameter name used later in a function
 	     declaration (such as in a late-specified return type).  Just
 	     make a dummy decl, since it's only used for its type.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dde9c62..e025019 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-26  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp0x/nsdmi-template1.C: New.
+
 2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* g++.dg/cpp0x/nullptr25.C: New.
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer4.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer4.C
index 68c8380..65b2e73 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer4.C
@@ -1,4 +1,5 @@
 // { dg-options -std=c++0x }
+// { dg-do run }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-template1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template1.C
new file mode 100644
index 0000000..04f1e03
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template1.C
@@ -0,0 +1,21 @@
+// { dg-do run }
+// { dg-options -std=c++0x }
+
+struct base
+{
+  int calc_avg() { return 42; }
+};
+
+template <class T> struct nsdmi : T
+{
+  nsdmi() {}
+  int avg() { return avg_; }
+  int avg_ = this->calc_avg();
+};
+
+int main()
+{
+  nsdmi<base> x;
+  if (x.avg() != 42)
+    __builtin_abort();
+}