Merge pull request #3502 from 9rnsr/fix12651

Issue 12651 - TemplateArgsOf accepts nonsensical arguments
dlang · Apr 27, 2014 · 68aa8cc · 68aa8cc
2 parents b65f13e + 1e78567
commit 68aa8cc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/template.c b/src/template.c
@@ -5486,10 +5486,10 @@ MATCH TemplateTupleParameter::matchArg(Loc loc, Scope *sc, Objects *tiargs,
     assert(i + 1 == dedtypes->dim);     // must be the last one
     Tuple *ovar;
 
-    if ((*dedtypes)[i] && isTuple((*dedtypes)[i]))
+    if (Tuple *u = isTuple((*dedtypes)[i]))
     {
         // It has already been deduced
-        ovar = isTuple((*dedtypes)[i]);
+        ovar = u;
     }
     else if (i + 1 == tiargs->dim && isTuple((*tiargs)[i]))
         ovar = isTuple((*tiargs)[i]);
@@ -5516,6 +5516,14 @@ MATCH TemplateTupleParameter::matchArg(Scope *sc, RootObject *oarg,
     Tuple *ovar = isTuple(oarg);
     if (!ovar)
         return MATCHnomatch;
+    if ((*dedtypes)[i])
+    {
+        Tuple *tup = isTuple((*dedtypes)[i]);
+        if (!tup)
+            return MATCHnomatch;
+        if (!match(tup, ovar))
+            return MATCHnomatch;
+    }
     (*dedtypes)[i] = ovar;
 
     if (psparam)

diff --git a/test/runnable/template9.d b/test/runnable/template9.d
@@ -3373,6 +3373,15 @@ void test12376()
     enum x = __traits(compiles, encode12376!2(x));
 }
 
+/******************************************/
+// 12651
+
+alias TemplateArgsOf12651(alias T : Base!Args, alias Base, Args...) = Args;
+
+struct S12651(T) { }
+
+static assert(!__traits(compiles, TemplateArgsOf12651!(S12651!int, S, float)));
+
 /******************************************/
 
 int main()