fix Issue 11513 - Assertion in module.c

src/module.c

@@ -514,7 +514,8 @@ void Module::parse()
     DsymbolTable *dst;
 
     if (md)
-    {   /* A ModuleDeclaration, md, was provided.
+    {
+        /* A ModuleDeclaration, md, was provided.
          * The ModuleDeclaration sets the packages this module appears in, and
          * the name of this module.
          */
@@ -523,17 +524,17 @@ void Module::parse()
         Package *ppack = NULL;
         dst = Package::resolve(md->packages, &this->parent, &ppack);
         assert(dst);
-#if 0
-        if (ppack && ppack->isModule())
+
+        Module *m = ppack ? ppack->isModule() : NULL;
+        if (m && strcmp(m->srcfile->name->name(), "package.d") != 0)
         {
-            error(loc, "package name '%s' in file %s conflicts with usage as a module name in file %s",
-                ppack->toChars(), srcname, ppack->isModule()->srcfile->toChars());
-            dst = modules;
+            ::error(md->loc, "package name '%s' conflicts with usage as a module name in file %s",
+                ppack->toPrettyChars(), m->srcfile->toChars());
         }
-#endif
     }
     else
-    {   /* The name of the module is set to the source file name.
+    {
+        /* The name of the module is set to the source file name.
          * There are no packages.
          */
         dst = modules;          // and so this module goes into global module symbol table
@@ -580,8 +581,7 @@ void Module::parse()
          */
         Dsymbol *prev = dst->lookup(ident);
         assert(prev);
-        Module *mprev = prev->isModule();
-        if (mprev)
+        if (Module *mprev = prev->isModule())
         {
             if (strcmp(srcname, mprev->srcfile->toChars()) == 0)
                 error(loc, "from file %s must be imported as module '%s'",
@@ -590,10 +590,8 @@ void Module::parse()
                 error(loc, "from file %s conflicts with another module %s from file %s",
                     srcname, mprev->toChars(), mprev->srcfile->toChars());
         }
-        else
+        else if (Package *pkg = prev->isPackage())
         {
-            Package *pkg = prev->isPackage();
-            assert(pkg);
             if (pkg->isPkgMod == PKGunknown && isPackageMod)
             {
                 /* If the previous inserted Package is not yet determined as package.d,
@@ -606,6 +604,8 @@ void Module::parse()
                 error(pkg->loc, "from file %s conflicts with package name %s",
                     srcname, pkg->toChars());
         }
+        else
+            assert(global.errors);
     }
     else
     {

test/fail_compilation/ice11136.d

@@ -0,0 +1,9 @@
+// EXTRA_SOURCES: imports/bar11136.d
+/*
+TEST_OUTPUT:
+---
+fail_compilation/imports/bar11136.d(1): Error: package name 'ice11136' conflicts with usage as a module name in file fail_compilation/ice11136.d
+---
+*/
+
+module ice11136;

test/fail_compilation/ice11513a.d

@@ -0,0 +1,10 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/imports/ice11513x.d(1): Error: package name 'ice11513a' conflicts with usage as a module name in file fail_compilation/ice11513a.d
+---
+*/
+
+module ice11513a;
+
+import imports.ice11513x;

test/fail_compilation/ice11513b.d

@@ -0,0 +1,10 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/imports/ice11513y.d(1): Error: package name 'ice11513b' conflicts with usage as a module name in file fail_compilation/ice11513b.d
+---
+*/
+
+module ice11513b;
+
+import imports.ice11513y;

test/fail_compilation/imports/bar11136.d

@@ -0,0 +1 @@
+module ice11136.bar11136;

test/fail_compilation/imports/ice11513x.d

@@ -0,0 +1 @@
+module ice11513a.imports;

test/fail_compilation/imports/ice11513y.d

@@ -0,0 +1 @@
+module ice11513b.imports.ice11513y;