fix Issue 9690 - cannot access to @disable'd symbol from inner functi…

…on of another @disable'd
dlang · Nov 17, 2013 · 57d52dd · 57d52dd
1 parent e560549
commit 57d52dd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/func.c b/src/func.c
@@ -165,6 +165,8 @@ void FuncDeclaration::semantic(Scope *sc)
         if (StructDeclaration *sd = ad->isStructDeclaration())
             sd->makeNested();
     }
+    if (sc->func)
+        storage_class |= sc->func->storage_class & STCdisable;
     // Remove prefix storage classes silently.
     if ((storage_class & STC_TYPECTOR) && !(ad || isNested()))
         storage_class &= ~STC_TYPECTOR;

diff --git a/test/compilable/compile1.d b/test/compilable/compile1.d
@@ -398,6 +398,21 @@ void test9348()
     assert(F!0 !in [new Object():1]);
 }
 
+/***************************************************/
+// 9690
+
+@disable
+{
+    void dep9690() {}
+    void test9690()
+    {
+        dep9690();      // OK
+        void inner()
+        {
+            dep9690();  // OK <- NG
+        }
+    }
+}
 
 /***************************************************/
 // 9987