fix Issue 22714 - ICE: Assertion failure in ClassDeclaration::isBaseOf

dlang · Jan 31, 2022 · 5436d4d · 5436d4d
1 parent 9759c53
commit 5436d4d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/src/dmd/mtype.d b/src/dmd/mtype.d
@@ -6360,6 +6360,9 @@ extern (C++) final class TypeClass : Type
 
     override MOD deduceWild(Type t, bool isRef)
     {
+        // If sym is forward referenced:
+        if (sym.semanticRun < PASS.semanticdone && !sym.isBaseInfoComplete())
+            sym.dsymbolSemantic(null);
         ClassDeclaration cd = t.isClassHandle();
         if (cd && (sym == cd || cd.isBaseOf(sym, null)))
             return Type.deduceWild(t, isRef);

diff --git a/test/compilable/imports/test22714a.d b/test/compilable/imports/test22714a.d
@@ -0,0 +1,3 @@
+module imports.test22714a;
+import imports.test22714b;
+class Statement {}
diff --git a/test/compilable/imports/test22714b.d b/test/compilable/imports/test22714b.d
@@ -0,0 +1,12 @@
+module imports.test22714b;
+import imports.test22714a;
+struct Array(T)
+{
+    T[] data;
+    T[1] smallarray;
+}
+struct Ensure
+{
+    Statement ensure;
+    Array!Ensure* arraySyntaxCopy;
+}
diff --git a/test/compilable/test22714.d b/test/compilable/test22714.d
@@ -0,0 +1,2 @@
+// https://issues.dlang.org/show_bug.cgi?id=22714
+import imports.test22714a;
diff --git a/test/fail_compilation/ice10727a.d b/test/fail_compilation/ice10727a.d
@@ -4,6 +4,8 @@
 TEST_OUTPUT:
 ---
 fail_compilation/imports/foo10727a.d(34): Error: undefined identifier `Frop`
+fail_compilation/imports/foo10727a.d(26): Error: template instance `foo10727a.CirBuff!(Foo)` error instantiating
+fail_compilation/imports/foo10727a.d(31):        instantiated from here: `Bar!(Foo)`
 ---
 */
 

diff --git a/test/fail_compilation/ice10727b.d b/test/fail_compilation/ice10727b.d
@@ -4,6 +4,8 @@
 TEST_OUTPUT:
 ---
 fail_compilation/imports/foo10727b.d(25): Error: undefined identifier `Frop`
+fail_compilation/imports/foo10727b.d(17): Error: template instance `foo10727b.CirBuff!(Foo)` error instantiating
+fail_compilation/imports/foo10727b.d(22):        instantiated from here: `Bar!(Foo)`
 ---
 */