Merge upstream stable (e274c8cbcc)

dmd/dimport.d

@@ -210,7 +210,16 @@ extern (C++) final class Import : Dsymbol
         if (mod && !mod.importedFrom)
             mod.importedFrom = sc ? sc._module.importedFrom : Module.rootModule;
         if (!pkg)
-            pkg = mod;
+        {
+            if (mod && mod.isPackageFile)
+            {
+                // one level depth package.d file (import pkg; ./pkg/package.d)
+                // it's necessary to use the wrapping Package already created
+                pkg = mod.pkg;
+            }
+            else
+                pkg = mod;
+        }
         //printf("-Import::load('%s'), pkg = %p\n", toChars(), pkg);
         return global.errors != errors;
     }

dmd/dmodule.d

@@ -429,6 +429,7 @@ extern (C++) final class Module : Package
     bool isHdrFile;             // if it is a header (.di) file
     bool isDocFile;             // if it is a documentation input file, not D source
     bool isPackageFile;         // if it is a package.d
+    Package pkg;                // if isPackageFile is true, the Package that contains this package.d
     Strings contentImportedFiles; // array of files whose content was imported
     int needmoduleinfo;
     int selfimports;            // 0: don't know, 1: does not, 2: does
@@ -1106,15 +1107,27 @@ else
              *
              * To avoid the conflict:
              * 1. If preceding package name insertion had occurred by Package::resolve,
-             *    later package.d loading will change Package::isPkgMod to PKG.module_ and set Package::mod.
+             *    reuse the previous wrapping 'Package' if it exists
              * 2. Otherwise, 'package.d' wrapped by 'Package' is inserted to the internal tree in here.
+             *
+             * Then change Package::isPkgMod to PKG.module_ and set Package::mod.
+             *
+             * Note that the 'wrapping Package' is the Package that contains package.d and other submodules,
+             * the one inserted to the symbol table.
              */
-            auto p = new Package(Loc.initial, ident);
+            auto ps = dst.lookup(ident);
+            Package p = ps ? ps.isPackage() : null;
+            if (p is null)
+            {
+                p = new Package(Loc.initial, ident);
+                p.tag = this.tag; // reuse the same package tag
+                p.symtab = new DsymbolTable();
+            }
+            this.tag = p.tag; // reuse the 'older' package tag
+            this.pkg = p;
             p.parent = this.parent;
             p.isPkgMod = PKG.module_;
             p.mod = this;
-            p.tag = this.tag; // reuse the same package tag
-            p.symtab = new DsymbolTable();
             s = p;
         }
         if (!dst.insert(s))
@@ -1138,16 +1151,9 @@ else
             }
             else if (Package pkg = prev.isPackage())
             {
-                if (pkg.isPkgMod == PKG.unknown && isPackageFile)
-                {
-                    /* If the previous inserted Package is not yet determined as package.d,
-                     * link it to the actual module.
-                     */
-                    pkg.isPkgMod = PKG.module_;
-                    pkg.mod = this;
-                    pkg.tag = this.tag; // reuse the same package tag
+                // 'package.d' loaded after a previous 'Package' insertion
+                if (isPackageFile)
                     amodules.push(this); // Add to global array of all modules
-                }
                 else
                     error(md ? md.loc : loc, "from file %s conflicts with package name %s", srcname, pkg.toChars());
             }

dmd/expressionsem.d

@@ -2381,6 +2381,8 @@ Package resolveIsPackage(Dsymbol sym)
         }
         pkg = imp.pkg;
     }
+    else if (auto mod = sym.isModule())
+        pkg = mod.isPackageFile ? mod.pkg : sym.isPackage();
     else
         pkg = sym.isPackage();
     if (pkg)
@@ -5788,7 +5790,9 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
         }
 
         // save expression as a string before any semantic expansion
-        auto assertExpMsg = exp.msg ? null : exp.toChars();
+        // if -checkaction=context is enabled an no message exists
+        const generateMsg = !exp.msg && global.params.checkAction == CHECKACTION.context;
+        auto assertExpMsg = generateMsg ? exp.toChars() : null;
 
         if (Expression ex = unaSemantic(exp, sc))
         {
@@ -5800,7 +5804,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
         exp.e1 = exp.e1.optimize(WANTvalue);
         exp.e1 = exp.e1.toBoolean(sc);
 
-        if (!exp.msg && global.params.checkAction == CHECKACTION.context)
+        if (generateMsg)
         // no message - use assert expression as msg
         {
             /*

dmd/module.h

@@ -85,6 +85,7 @@ class Module : public Package
     bool isHdrFile;     // if it is a header (.di) file
     bool isDocFile;     // if it is a documentation input file, not D source
     bool isPackageFile; // if it is a package.d
+    Package *pkg;       // if isPackageFile is true, the Package that contains this package.d
     Strings contentImportedFiles;  // array of files whose content was imported
     int needmoduleinfo;
     int selfimports;            // 0: don't know, 1: does not, 2: does