Merge pull request #5192 from 9rnsr/fix15200

[REG2.068.2] Issue 15200 - ICE(glue.c) when compiling with -inline

src/dtemplate.d

@@ -7346,8 +7346,8 @@ public:
         }
         //printf("%s->appendToModuleMember() enclosing = %s mi = %s\n",
         //    toPrettyChars(),
-        //    enclosing ? enclosing.toPrettyChars() : NULL,
-        //    mi ? mi.toPrettyChars() : NULL);
+        //    enclosing ? enclosing.toPrettyChars() : null,
+        //    mi ? mi.toPrettyChars() : null);
         if (!mi || mi.isRoot())
         {
             /* If the instantiated module is speculative or root, insert to the

src/inline.d

@@ -1948,14 +1948,6 @@ void expandInline(FuncDeclaration fd, FuncDeclaration parent, Expression eret,
     }
     scope ids = new InlineDoState(parent, fd);
 
-    // When the function is actually expanded
-    if (TemplateInstance ti = fd.isInstantiated())
-    {
-        // change ti to non-speculative root instance
-        if (!ti.minst)
-            ti.minst = ti.tempdecl.getModule().importedFrom;
-    }
-
     if (asStatements)
         as = new Statements();
     VarDeclaration vret = null;

test/runnable/ice15200.d

@@ -0,0 +1,11 @@
+// EXTRA_SOURCES: imports/ice15200a.d imports/ice15200b.d
+// COMPILE_SEPARATELY
+
+module ice15200;
+
+import imports.ice15200a;
+
+void main()
+{
+    f();
+}

test/runnable/imports/ice15200a.d

@@ -0,0 +1,12 @@
+import imports.ice15200b;
+
+auto f() // not void
+{
+    sub([0], false);
+}
+void sub(R)(R list, bool b)
+{
+    foreach (i; list.filter!(delegate(e) => b))
+    {
+    }
+}

test/runnable/imports/ice15200b.d

@@ -0,0 +1,41 @@
+module imports.ice15200b;
+
+template filter(alias pred)
+{
+    auto filter(R)(R range)
+    {
+        return FilterResult!(pred, R)(range);
+    }
+}
+
+struct FilterResult(alias pred, R)
+{
+    R _input;
+
+    this(R r)
+    {
+        _input = r;
+        while (_input.length && !pred(_input[0]))
+        {
+            _input = _input[1..$];
+        }
+    }
+
+    @property bool empty()
+    {
+        return _input.length == 0;
+    }
+
+    @property auto ref front()
+    {
+        return _input[0];
+    }
+
+    void popFront()
+    {
+        do
+        {
+            _input = _input[1..$];
+        } while (_input.length && !pred(_input[0]));
+    }
+}