Merge pull request #4031 from 9rnsr/fix13550

[REG2.067a] Issue 13550 - Inner functions take outer function attributes erroneously
dlang · Sep 29, 2014 · 5118d69 · 5118d69
2 parents 18e0968 + d8df4bf
commit 5118d69
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/func.c b/src/func.c
@@ -1863,7 +1863,7 @@ void FuncDeclaration::semantic3(Scope *sc)
                         exp->checkEscape();
                     }
 
-                    exp = checkGC(sc, exp);
+                    exp = checkGC(sc2, exp);
 
                     if (vresult)
                     {

diff --git a/test/compilable/nogc.d b/test/compilable/nogc.d
@@ -97,3 +97,15 @@ static if (is(__vector(ulong[2])))
         return [0, 0];
     }
 }
+
+/******************************************/
+// 13550
+
+auto foo13550() @nogc
+{
+    static int[] bar()
+    {
+        return new int[2];
+    }
+    return &bar;
+}