Merge pull request #5441 from Dicebot/fix-15668-default-line

Fix 15668: __LINE__ evaluated at declaration context
dlang · Feb 11, 2016 · 8ec7ea9 · 8ec7ea9
2 parents 31232a9 + 43ffdd0
commit 8ec7ea9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/dtemplate.d b/src/dtemplate.d
@@ -1435,7 +1435,7 @@ public:
                                          * the oded == oarg
                                          */
                                         (*dedargs)[i] = oded;
-                                        MATCH m2 = tparam.matchArg(loc, paramscope, dedargs, i, parameters, dedtypes, null);
+                                        MATCH m2 = tparam.matchArg(instLoc, paramscope, dedargs, i, parameters, dedtypes, null);
                                         //printf("m2 = %d\n", m2);
                                         if (m2 <= MATCHnomatch)
                                             goto Lnomatch;
@@ -1453,7 +1453,7 @@ public:
                                 }
                                 else
                                 {
-                                    oded = tparam.defaultArg(loc, paramscope);
+                                    oded = tparam.defaultArg(instLoc, paramscope);
                                     if (oded)
                                         (*dedargs)[i] = declareParameter(paramscope, tparam, oded);
                                 }

diff --git a/test/compilable/test15668.d b/test/compilable/test15668.d
@@ -0,0 +1,9 @@
+void foo ( int line = __LINE__ ) ( string msg = "" )
+{
+    static assert (line == 8);
+}
+
+void main()
+{
+    foo();
+}