Merge pull request #4672 from 9rnsr/fix14609

[REG2.068a] Issue 14609 - Github HEAD: DMD assertion failure for valid code
dlang · May 20, 2015 · ba848af · ba848af
2 parents 14273b3 + 6e0a27b
commit ba848af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/class.c b/src/class.c
@@ -1564,14 +1564,8 @@ void InterfaceDeclaration::semantic(Scope *sc)
     for (size_t i = 0; i < members->dim; i++)
     {
         Dsymbol *s = (*members)[i];
-        /* There are problems doing this in the general case because
-         * Scope keeps track of things like 'offset'
-         */
-        if (s->isEnumDeclaration() || (s->isAggregateDeclaration() && s->ident))
-        {
-            //printf("setScope %s %s\n", s->kind(), s->toChars());
-            s->setScope(sc2);
-        }
+        //printf("setScope %s %s\n", s->kind(), s->toChars());
+        s->setScope(sc2);
     }
 
     for (size_t i = 0; i < members->dim; i++)

diff --git a/test/compilable/testfwdref.d b/test/compilable/testfwdref.d
@@ -460,6 +460,7 @@ class Frop14549
 }
 
 // ----
+// regression case
 
 template Mix14549()
 {
@@ -477,3 +478,16 @@ class Bar14549
     mixin Mix14549;
     int boo;
 }
+
+// ----
+// 14609 - regression case
+
+interface Foo14609(T)
+{
+    static if (is(T == int))
+        public int bar();
+}
+class Frop14609 : Foo14609!int
+{
+    public int bar() { return 0; }
+}