Support -allinst for old TypeInfo generation strategy

dlang · Jul 25, 2015 · b06abfb · b06abfb
1 parent c8adc88
commit b06abfb
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/src/struct.c b/src/struct.c
@@ -56,7 +56,9 @@ FuncDeclaration *search_toString(StructDeclaration *sd)
  */
 void semanticTypeInfo(Scope *sc, Type *t)
 {
-#if 0
+    if (!global.params.allInst)
+        return;
+
     class FullTypeInfoVisitor : public Visitor
     {
     public:
@@ -125,7 +127,6 @@ void semanticTypeInfo(Scope *sc, Type *t)
     FullTypeInfoVisitor v;
     v.sc = sc;
     t->accept(&v);
-#endif
 }
 
 /********************************* AggregateDeclaration ****************************/
@@ -216,7 +217,7 @@ void AggregateDeclaration::semantic3(Scope *sc)
     StructDeclaration *sd = isStructDeclaration();
     if (!sc)    // from runDeferredSemantic3 for TypeInfo generation
     {
-        assert(sd);
+        assert(sd && global.params.allInst);
         sd->semanticTypeInfoMembers();
         return;
     }

diff --git a/src/toobj.c b/src/toobj.c
@@ -1018,7 +1018,7 @@ void toObjFile(Dsymbol *ds, bool multiobj)
             if (tid->semanticRun >= PASSobj)    // already written
                 return;
 
-            if (tid->tinfo->mod == 0)
+            if (tid->tinfo->mod == 0 && !global.params.allInst)
             {
                 Dsymbol *sym = tid->tinfo->toDsymbol(NULL);
                 if (sym)

diff --git a/src/typinf.c b/src/typinf.c
@@ -69,7 +69,39 @@ void genTypeInfo(Type *torig, Scope *sc)
         else
             t->vtinfo = getTypeInfoDeclaration(t);
         assert(t->vtinfo);
+
+        /* If this has a custom implementation in std/typeinfo, then
+         * do not generate a COMDAT for it.
+         */
+        if (builtinTypeInfo(t))
+            goto Lskip;
+
+        if (global.params.allInst)
+        {
+            // Generate COMDAT
+            if (sc)                     // if in semantic() pass
+            {
+                if (sc->func && sc->func->inNonRoot())
+                {
+                    // Bugzilla 13043: Avoid linking TypeInfo if it's not
+                    // necessary for root module compilation
+                }
+                else
+                {
+                    // Find module that will go all the way to an object file
+                    Module *m = sc->module->importedFrom;
+                    m->members->push(t->vtinfo);
+
+                    semanticTypeInfo(sc, t);
+                }
+            }
+            else                        // if in obj generation pass
+            {
+                toObjFile(t->vtinfo, global.params.multiobj);
+            }
+        }
     }
+    if (!global.params.allInst)
     {
         /* If this has a custom implementation in std/typeinfo, then
          * do not generate a COMDAT for it.