Only compile unittests in root modules

Author: marler8997

src/dmd/astbase.d

@@ -1441,6 +1441,21 @@ struct ASTBase
             srcfile = new File(srcfilename);
         }
 
+        /**
+        A root module is one that will be compiled all the way to object code.
+        */
+        final bool isRoot() const
+        {
+            return true;
+        }
+
+        /**
+        Called by the parser after the module declaration has been determined.
+        */
+        final void afterModuleDeclaration()
+        {
+        }
+
         override void accept(Visitor v)
         {
             v.visit(this);

src/dmd/dmodule.d

@@ -292,10 +292,10 @@ extern (C++) final class Module : Package
     extern (C++) static __gshared Dsymbols deferred3;   // deferred Dsymbol's needing semantic3() run on them
     extern (C++) static __gshared uint dprogress;       // progress resolving the deferred list
     /**
-     * A callback function that is called once an imported module is
-     * parsed. If the callback returns true, then it tells the
-     * frontend that the driver intends on compiling the import.
-     */
+    A callback function that is called when a module is loaded as soon as its
+    module declaration has been parsed. If the callback returns true, then it tells the
+    frontend that the driver intends on compiling the import.
+    */
     extern (C++) static __gshared bool function(Module mod) onImport;
 
     static void _init()
@@ -369,14 +369,8 @@ extern (C++) final class Module : Package
     Dsymbol searchCacheSymbol;  // cached value of search
     int searchCacheFlags;       // cached flags
 
-    /**
-     * A root module is one that will be compiled all the way to
-     * object code.  This field holds the root module that caused
-     * this module to be loaded.  If this module is a root module,
-     * then it will be set to `this`.  This is used to determine
-     * ownership of template instantiation.
-     */
     Module importedFrom;
+    bool isCompiledImport;
 
     Dsymbols* decldefs;         // top level declarations for this Module
 
@@ -515,41 +509,6 @@ extern (C++) final class Module : Package
             message("import    %s", buf.peekString());
         }
         m = m.parse();
-
-        // Call onImport here because if the module is going to be compiled then we
-        // need to determine it early because it affects semantic analysis. This is
-        // being done after parsing the module so the full module name can be taken
-        // from whatever was declared in the file.
-
-        //!!!!!!!!!!!!!!!!!!!!!!!
-        // Workaround for bug in dmd version 2.068.2 platform Darwin_64_32.
-        // This is the compiler version that the autotester uses, and this code
-        // has been carefully crafted using trial and error to prevent a seg fault
-        // bug that occurs with that version of the compiler.  Note, this segfault
-        // does not occur on the next version of dmd, namely, version 2.069.0. If
-        // the autotester upgrades to that version, then this workaround can be removed.
-        //!!!!!!!!!!!!!!!!!!!!!!!
-        version(OSX)
-        {
-            if (!m.isRoot() && onImport)
-            {
-                auto onImportResult = onImport(m);
-                if(onImportResult)
-                {
-                    m.importedFrom = m;
-                    assert(m.isRoot());
-                }
-            }
-        }
-        else
-        {
-            if (!m.isRoot() && onImport && onImport(m))
-            {
-                m.importedFrom = m;
-                assert(m.isRoot());
-            }
-        }
-
         Target.loadModule(m);
         return m;
     }
@@ -1288,9 +1247,28 @@ extern (C++) final class Module : Package
         return false;
     }
 
-    bool isRoot()
+    /**
+    A root module is one that will be compiled all the way to object code.
+    */
+    final bool isRoot() const
+    {
+        return this.importedFrom == this || isCompiledImport;
+    }
+
+    /**
+    Called by the parser after the module declaration has been determined.
+    */
+    final void afterModuleDeclaration()
     {
-        return this.importedFrom == this;
+        // Call onImport here because if the module is going to be compiled then we
+        // need to determine it early because it affects whether unittests will be parsed
+        // and semantic analysis. This is being done right after parsing the module delclaration
+        // so the full module name can be taken from whatever was declared in the file.
+        if (!isRoot() && Module.onImport && Module.onImport(this))
+        {
+            isCompiledImport = true;
+            assert(isRoot());
+        }
     }
 
     // true if the module source file is directly

src/dmd/glue.d

@@ -752,8 +752,17 @@ void FuncDeclaration_toObjFile(FuncDeclaration fd, bool multiobj)
     if (!fd.fbody)
         return;
 
+    // Find module m for this function
+    Module m = null;
+    for (Dsymbol p = fd.parent; p; p = p.parent)
+    {
+        m = p.isModule();
+        if (m)
+            break;
+    }
+
     UnitTestDeclaration ud = fd.isUnitTestDeclaration();
-    if (ud && !global.params.useUnitTests)
+    if (ud && (!global.params.useUnitTests || !m.isRoot))
         return;
 
     if (multiobj && !fd.isStaticDtorDeclaration() && !fd.isStaticCtorDeclaration())
@@ -886,15 +895,6 @@ void FuncDeclaration_toObjFile(FuncDeclaration fd, bool multiobj)
     symtab_t *symtabsave = cstate.CSpsymtab;
     cstate.CSpsymtab = &f.Flocsym;
 
-    // Find module m for this function
-    Module m = null;
-    for (Dsymbol p = fd.parent; p; p = p.parent)
-    {
-        m = p.isModule();
-        if (m)
-            break;
-    }
-
     Dsymbols deferToObj;                   // write these to OBJ file later
     Array!(elem*) varsInScope;
     Label*[void*] labels = null;

src/dmd/module.h

@@ -101,6 +101,7 @@ class Module : public Package
     // i.e. a module that will be taken all the
     // way to an object file
     Module *importedFrom;
+    bool isCompiledImport;
 
     Dsymbols *decldefs;         // top level declarations for this Module
 
@@ -144,7 +145,7 @@ class Module : public Package
     static void clearCache();
     int imports(Module *m);
 
-    bool isRoot() { return this->importedFrom == this; }
+    bool isRoot() const { return this->importedFrom == this || this->isCompiledImport; }
     // true if the module source file is directly
     // listed in command line.
     bool isCoreModule(Identifier *ident);

src/dmd/parse.d

@@ -377,6 +377,8 @@ final class Parser(AST) : Lexer
             }
         }
 
+        mod.afterModuleDeclaration();
+
         decldefs = parseDeclDefs(0, &lastDecl);
         if (token.value != TOK.endOfFile)
         {
@@ -547,7 +549,7 @@ final class Parser(AST) : Lexer
                     break;
                 }
             case TOK.unittest_:
-                if (global.params.useUnitTests || global.params.doDocComments || global.params.doHdrGeneration)
+                if ( (global.params.useUnitTests || global.params.doDocComments || global.params.doHdrGeneration) && mod.isRoot)
                 {
                     s = parseUnitTest(pAttrs);
                     if (*pLastDecl)