Merge pull request #3884 from WalterBright/fix11946

[reg] fix Issue 11946 - need 'this' to access member when passing field to template parameter
dlang · Aug 28, 2014 · 8b7a3cb · 8b7a3cb
1 parent 4532cfe
commit 8b7a3cb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/template.c b/src/template.c
@@ -1374,8 +1374,13 @@ MATCH TemplateDeclaration::deduceFunctionTemplateMatch(
         }
     }
 
+#if BUGZILLA_11946
     if (isstatic)
         tthis = NULL;
+#else
+    if (toParent()->isModule() || (scope->stc & STCstatic))
+        tthis = NULL;
+#endif
     if (tthis)
     {
         bool hasttp = false;
@@ -6468,8 +6473,10 @@ void TemplateInstance::semantic(Scope *sc, Expressions *fargs)
     sc2->parent = this;
     sc2->tinst = this;
     sc2->speculative = speculative;
+#if BUGZILLA_11946
     if (enclosing && tempdecl->isstatic)
         sc2->stc &= ~STCstatic;
+#endif
 
     tryExpandMembers(sc2);
 

diff --git a/test/runnable/template9.d b/test/runnable/template9.d
@@ -2970,6 +2970,8 @@ void test11271()
 /******************************************/
 // 11533
 
+version (none)
+{
 struct S11533
 {
     void put(alias fun)() { fun!int(); }
@@ -3002,6 +3004,20 @@ void test11533c()
     assert(foo.call() == var);
 }
 
+void test11533()
+{
+    test11533a();
+    test11533b();
+    test11533c();
+}
+}
+else
+{
+void test11533()
+{
+}
+}
+
 /******************************************/
 // 11553
 
@@ -4213,9 +4229,7 @@ int main()
     test10811();
     test10969();
     test11271();
-    test11533a();
-    test11533b();
-    test11533c();
+    test11533();
     test11818();
     test11843();
     test11872();