Merge pull request #3264 from 9rnsr/fix12158

[REG2.056] Issue 12158 - ICE with .init of nonexisting selective import
dlang · Feb 15, 2014 · 3e79f51 · 3e79f51
1 parent b1ba734
commit 3e79f51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/import.c b/src/import.c
@@ -251,9 +251,9 @@ void Import::semantic(Scope *sc)
         sc->protection = PROTpublic;
 #endif
         for (size_t i = 0; i < aliasdecls.dim; i++)
-        {   AliasDeclaration *ad = aliasdecls[i];
-
-            //printf("\tImport alias semantic('%s')\n", s->toChars());
+        {
+            AliasDeclaration *ad = aliasdecls[i];
+            //printf("\tImport alias semantic('%s')\n", ad->toChars());
             if (mod->search(loc, names[i]))
             {
                 ad->semantic(sc);
@@ -265,6 +265,7 @@ void Import::semantic(Scope *sc)
                     mod->error(loc, "import '%s' not found, did you mean '%s %s'?", names[i]->toChars(), s->kind(), s->toChars());
                 else
                     mod->error(loc, "import '%s' not found", names[i]->toChars());
+                ad->type = Type::terror;
             }
         }
         sc = sc->pop();

diff --git a/test/fail_compilation/ice12158.d b/test/fail_compilation/ice12158.d
@@ -0,0 +1,8 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice12158.d(7): Error: module object import 'nonexisting' not found
+---
+*/
+import object : nonexisting;
+auto x = nonexisting.init;