Merge pull request #6493 from WalterBright/scope-self-ref

scope: parameter does not escape through itself
dlang · Feb 11, 2017 · a1c9439 · a1c9439
2 parents 041bc9e + 209b82e
commit a1c9439
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/mtype.d b/src/mtype.d
@@ -6652,6 +6652,8 @@ extern (C++) final class TypeFunction : TypeNext
             foreach (const i; 0 .. dim)
             {
                 Parameter fparam = Parameter.getNth(parameters, i);
+                if (fparam == p)
+                    continue;
                 Type t = fparam.type;
                 if (!t)
                     continue;

diff --git a/test/fail_compilation/retscope.d b/test/fail_compilation/retscope.d
@@ -626,6 +626,18 @@ struct Result(R)
     n.empty();
 }
 
+/**********************************************/
+
+@safe void foo22()(ref char[] s)
+{
+    char[] a = s;
+}
+
+@safe void test22(scope char[] s)
+{
+    foo22(s);
+}
+
 /************************************************/
 
 // https://issues.dlang.org/show_bug.cgi?id=17117