Merge pull request #5170 from 9rnsr/fix15176

[REG2.069.0-b1] Issue 15176 - ICE(glue.c):separate compilation with -inline crash in glue.c
dlang · Oct 8, 2015 · f09bb06 · f09bb06
2 parents 95d0764 + b8a3966
commit f09bb06
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/src/dstruct.d b/src/dstruct.d
@@ -113,19 +113,26 @@ extern (C++) void semanticTypeInfo(Scope* sc, Type t)
                 Scope scx;
                 scx._module = sd.getModule();
                 getTypeInfoType(t, &scx);
+                sd.requestTypeInfo = true;
+            }
+            else if (!sc.minst)
+            {
+                // don't yet have to generate TypeInfo instance if
+                // the typeid(T) expression exists in speculative scope.
             }
             else
             {
                 getTypeInfoType(t, sc);
+                sd.requestTypeInfo = true;
 
                 // Bugzilla 15149, if the typeid operand type comes from a
                 // result of auto function, it may be yet speculative.
                 unSpeculative(sc, sd);
             }
-            if (!sc || sc.minst)
-                sd.requestTypeInfo = true;
 
             /* Step 2: If the TypeInfo generation requires sd.semantic3, run it later.
+             * This should be done even if typeid(T) exists in speculative scope.
+             * Because it may appear later in non-speculative scope.
              */
             if (!sd.members)
                 return; // opaque struct
@@ -179,9 +186,6 @@ extern (C++) void semanticTypeInfo(Scope* sc, Type t)
             return;
         if (sc.flags & (SCOPEctfe | SCOPEcompile))
             return;
-
-        if (!sc.minst)
-            return; // don't have to generate TypeInfo inside speculative scope
     }
 
     scope FullTypeInfoVisitor v = new FullTypeInfoVisitor();

diff --git a/test/runnable/ice15176.d b/test/runnable/ice15176.d
@@ -0,0 +1,9 @@
+// EXTRA_SOURCES: imports/ice15176a.d imports/ice15176b.d
+// COMPILE_SEPARATELY
+
+import imports.ice15176a;
+
+void main()
+{
+    func();
+}
diff --git a/test/runnable/imports/ice15176a.d b/test/runnable/imports/ice15176a.d
@@ -0,0 +1,13 @@
+module imports.ice15176a;
+
+import imports.ice15176b;
+
+struct Stack(T)
+{
+    T[] data;
+}
+
+void func()
+{
+    alias ValStack = Stack!CodepointSet;
+}
diff --git a/test/runnable/imports/ice15176b.d b/test/runnable/imports/ice15176b.d
@@ -0,0 +1,8 @@
+module imports.ice15176b;
+
+alias CodepointSet = InversionList!();
+
+struct InversionList()
+{
+    uint[] data;
+}