fix Issue 10354 - DIP37: ICE with using indirectly imported template …

…through package.d
dlang · Jun 14, 2013 · eea99d6 · eea99d6
1 parent 095b58a
commit eea99d6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/src/import.c b/src/import.c
@@ -166,10 +166,10 @@ void Import::load(Scope *sc)
         {
             dst->insert(id, mod);           // id may be different from mod->ident,
                                             // if so then insert alias
-            if (!mod->importedFrom)
-                mod->importedFrom = sc ? sc->module->importedFrom : Module::rootModule;
         }
     }
+    if (mod && !mod->importedFrom)
+        mod->importedFrom = sc ? sc->module->importedFrom : Module::rootModule;
     if (!pkg)
         pkg = mod;
 

diff --git a/test/compilable/extra-files/pkgDIP37_10354/mbar.d b/test/compilable/extra-files/pkgDIP37_10354/mbar.d
@@ -0,0 +1,2 @@
+module pkgDIP37_10354.mbar;
+void bar(T)() {}
diff --git a/test/compilable/extra-files/pkgDIP37_10354/mfoo.d b/test/compilable/extra-files/pkgDIP37_10354/mfoo.d
@@ -0,0 +1,2 @@
+module pkgDIP37_10354.mfoo;
+void foo(T)() {}
diff --git a/test/compilable/extra-files/pkgDIP37_10354/package.d b/test/compilable/extra-files/pkgDIP37_10354/package.d
@@ -0,0 +1,3 @@
+module pkgDIP37_10354;
+public import pkgDIP37_10354.mfoo;
+public import pkgDIP37_10354.mbar;
diff --git a/test/compilable/testDIP37_10354.d b/test/compilable/testDIP37_10354.d
@@ -0,0 +1,11 @@
+// PERMUTE_ARGS:
+// REQUIRED_ARGS: -o- -Icompilable/extra-files
+
+module testDIP37_10354;
+import pkgDIP37_10354.mfoo;
+void main()
+{
+    import pkgDIP37_10354;
+    foo!string();   // OK
+    bar!string();   // OK <- ICE
+}