Emit struct TypeInfos in referencing compilation units only

dmd/aggregate.h

@@ -167,10 +167,12 @@ class StructDeclaration : public AggregateDeclaration
     bool hasIdentityEquals;     // true if has identity opEquals
     bool hasNoFields;           // has no fields
     bool hasCopyCtor;           // copy constructor
+#if !IN_LLVM
     // Even if struct is defined as non-root symbol, some built-in operations
     // (e.g. TypeidExp, NewExp, ArrayLiteralExp, etc) request its TypeInfo.
     // For those, today TypeInfo_Struct is generated in COMDAT.
     bool requestTypeInfo;
+#endif
 
     FuncDeclarations postblits; // Array of postblit functions
     FuncDeclaration *postblit;  // aggregate postblit

dmd/dstruct.d

@@ -104,7 +104,10 @@ extern (C++) void semanticTypeInfo(Scope* sc, Type t)
             Scope scx;
             scx._module = sd.getModule();
             getTypeInfoType(sd.loc, t, &scx);
+version (IN_LLVM) {} else
+{
             sd.requestTypeInfo = true;
+}
         }
         else if (!sc.minst)
         {
@@ -114,7 +117,10 @@ extern (C++) void semanticTypeInfo(Scope* sc, Type t)
         else
         {
             getTypeInfoType(sd.loc, t, sc);
+version (IN_LLVM) {} else
+{
             sd.requestTypeInfo = true;
+}
 
             // https://issues.dlang.org/show_bug.cgi?id=15149
             // if the typeid operand type comes from a
@@ -205,10 +211,13 @@ extern (C++) class StructDeclaration : AggregateDeclaration
     bool hasIdentityEquals;     // true if has identity opEquals
     bool hasNoFields;           // has no fields
     bool hasCopyCtor;           // copy constructor
+version (IN_LLVM) {} else
+{
     // Even if struct is defined as non-root symbol, some built-in operations
     // (e.g. TypeidExp, NewExp, ArrayLiteralExp, etc) request its TypeInfo.
     // For those, today TypeInfo_Struct is generated in COMDAT.
     bool requestTypeInfo;
+}
 
     FuncDeclarations postblits; // Array of postblit functions
     FuncDeclaration postblit;   // aggregate postblit

dmd/expressionsem.d

@@ -7105,6 +7105,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
         {
             if (ad.dtor)
             {
+                err |= !ad.dtor.functionSemantic();
                 err |= exp.checkPurity(sc, ad.dtor);
                 err |= exp.checkSafety(sc, ad.dtor);
                 err |= exp.checkNogc(sc, ad.dtor);

dmd/typinf.d

@@ -75,6 +75,12 @@ void genTypeInfo(Loc loc, Type torig, Scope* sc)
             t.vtinfo = getTypeInfoDeclaration(t);
         assert(t.vtinfo);
 
+version (IN_LLVM)
+{
+        // LDC handles emission in the codegen layer
+}
+else
+{
         /* If this has a custom implementation in std/typeinfo, then
          * do not generate a COMDAT for it.
          */
@@ -89,16 +95,10 @@ void genTypeInfo(Loc loc, Type torig, Scope* sc)
             }
             else // if in obj generation pass
             {
-version (IN_LLVM)
-{
-                Declaration_codegen(t.vtinfo);
-}
-else
-{
                 toObjFile(t.vtinfo, global.params.multiobj);
-}
             }
         }
+} // !IN_LLVM
     }
     if (!torig.vtinfo)
         torig.vtinfo = t.vtinfo; // Types aren't merged, but we can share the vtinfo's
@@ -157,12 +157,19 @@ private TypeInfoDeclaration getTypeInfoDeclaration(Type t)
     }
 }
 
+version (IN_LLVM)
+{
+    // LDC handles TypeInfo emission in the codegen layer
+    // => no need to take care of speculative types.
+}
+else
+{
+
 /**************************************************
  * Returns:
  *      true if any part of type t is speculative.
  *      if t is null, returns false.
  */
-extern (C++) // IN_LLVM
 bool isSpeculativeType(Type t)
 {
     static bool visitVector(TypeVector t)
@@ -255,6 +262,8 @@ bool isSpeculativeType(Type t)
     }
 }
 
+} // !IN_LLVM
+
 /* ========================================================================= */
 
 /* These decide if there's an instance for them already in std.typeinfo,
@@ -263,8 +272,8 @@ bool isSpeculativeType(Type t)
 // IN_LLVM: replaced `private` with `extern(C++)`
 extern(C++) bool builtinTypeInfo(Type t)
 {
-    // LDC_FIXME: if I enable for Tclass, the way LDC does typeinfo will cause
-    // a bunch of linker errors to missing ClassInfo init symbols.
+    // IN_LLVM: the Tclass case seems to be a DMD hack
+    //          (in order not to define ClassInfos in each referencing module)
     if (t.isTypeBasic() || (!IN_LLVM && t.ty == Tclass) || t.ty == Tnull)
         return !t.mod;
     if (t.ty == Tarray)

gen/declarations.cpp

@@ -92,21 +92,23 @@ class CodegenVisitor : public Visitor {
       return;
     }
 
-    if (decl->members && decl->symtab) {
-      DtoResolveClass(decl);
-      decl->ir->setDefined();
+    if (!(decl->members && decl->symtab)) {
+      return;
+    }
 
-      // Emit any members (e.g. final functions).
-      for (auto m : *decl->members) {
-        m->accept(this);
-      }
+    DtoResolveClass(decl);
+    decl->ir->setDefined();
 
-      // Emit TypeInfo.
-      IrClass *ir = getIrAggr(decl);
-      if (!ir->suppressTypeInfo() && !isSpeculativeType(decl->type)) {
-        llvm::GlobalVariable *interfaceZ = ir->getClassInfoSymbol();
-        defineGlobal(interfaceZ, ir->getClassInfoInit(), decl);
-      }
+    // Emit any members (e.g. final functions).
+    for (auto m : *decl->members) {
+      m->accept(this);
+    }
+
+    // Emit TypeInfo.
+    IrClass *ir = getIrAggr(decl);
+    if (!ir->suppressTypeInfo()) {
+      llvm::GlobalVariable *interfaceZ = ir->getClassInfoSymbol();
+      defineGlobal(interfaceZ, ir->getClassInfoInit(), decl);
     }
   }
 
@@ -128,6 +130,7 @@ class CodegenVisitor : public Visitor {
     }
 
     if (!(decl->members && decl->symtab)) {
+      // nothing to do for opaque structs anymore
       return;
     }
 
@@ -151,11 +154,9 @@ class CodegenVisitor : public Visitor {
         setLinkageAndVisibility(decl, initGlobal);
       }
 
-      // emit typeinfo
+      // Emit special __xopEquals/__xopCmp/__xtoHash member functions required
+      // for the TypeInfo.
       if (!ir->suppressTypeInfo()) {
-        DtoTypeInfoOf(decl->type, /*base=*/false);
-
-        // Emit __xopEquals/__xopCmp/__xtoHash.
         if (decl->xeq && decl->xeq != decl->xerreq) {
           decl->xeq->accept(this);
         }
@@ -165,6 +166,8 @@ class CodegenVisitor : public Visitor {
         if (decl->xhash) {
           decl->xhash->accept(this);
         }
+
+        // the TypeInfo itself is emitted into each referencing CU
       }
     }
   }
@@ -188,31 +191,33 @@ class CodegenVisitor : public Visitor {
       return;
     }
 
-    if (decl->members && decl->symtab) {
-      DtoResolveClass(decl);
-      decl->ir->setDefined();
+    if (!(decl->members && decl->symtab)) {
+      return;
+    }
 
-      for (auto m : *decl->members) {
-        m->accept(this);
-      }
+    DtoResolveClass(decl);
+    decl->ir->setDefined();
 
-      IrClass *ir = getIrAggr(decl);
+    for (auto m : *decl->members) {
+      m->accept(this);
+    }
 
-      auto &initZ = ir->getInitSymbol();
-      auto initGlobal = llvm::cast<LLGlobalVariable>(initZ);
-      initZ = irs->setGlobalVarInitializer(initGlobal, ir->getDefaultInit());
-      setLinkageAndVisibility(decl, initGlobal);
+    IrClass *ir = getIrAggr(decl);
 
-      llvm::GlobalVariable *vtbl = ir->getVtblSymbol();
-      defineGlobal(vtbl, ir->getVtblInit(), decl);
+    auto &initZ = ir->getInitSymbol();
+    auto initGlobal = llvm::cast<LLGlobalVariable>(initZ);
+    initZ = irs->setGlobalVarInitializer(initGlobal, ir->getDefaultInit());
+    setLinkageAndVisibility(decl, initGlobal);
 
-      ir->defineInterfaceVtbls();
+    llvm::GlobalVariable *vtbl = ir->getVtblSymbol();
+    defineGlobal(vtbl, ir->getVtblInit(), decl);
 
-      // Emit TypeInfo.
-      if (!ir->suppressTypeInfo() && !isSpeculativeType(decl->type)) {
-        llvm::GlobalVariable *classZ = ir->getClassInfoSymbol();
-        defineGlobal(classZ, ir->getClassInfoInit(), decl);
-      }
+    ir->defineInterfaceVtbls();
+
+    // Emit TypeInfo.
+    if (!ir->suppressTypeInfo()) {
+      llvm::GlobalVariable *classZ = ir->getClassInfoSymbol();
+      defineGlobal(classZ, ir->getClassInfoInit(), decl);
     }
   }
 
@@ -503,8 +508,7 @@ class CodegenVisitor : public Visitor {
   //////////////////////////////////////////////////////////////////////////
 
   void visit(TypeInfoDeclaration *decl) override {
-    if (!irs->dcomputetarget)
-      TypeInfoDeclaration_codegen(decl);
+    llvm_unreachable("Should be emitted from codegen layer only");
   }
 };
 

gen/llvmhelpers.cpp

@@ -827,8 +827,9 @@ void DtoResolveDsymbol(Dsymbol *dsym) {
 }
 
 void DtoResolveVariable(VarDeclaration *vd) {
-  if (vd->isTypeInfoDeclaration()) {
-    return DtoResolveTypeInfo(static_cast<TypeInfoDeclaration *>(vd));
+  if (auto tid = vd->isTypeInfoDeclaration()) {
+    DtoResolveTypeInfo(tid);
+    return;
   }
 
   IF_LOG Logger::println("DtoResolveVariable(%s)", vd->toPrettyChars());
@@ -1263,17 +1264,12 @@ LLConstant *DtoTypeInfoOf(Type *type, bool base) {
                          type->toChars(), base);
   LOG_SCOPE
 
-  TypeInfoDeclaration *tidecl =
-      getOrCreateTypeInfoDeclaration(Loc(), type, nullptr);
-  assert(tidecl);
-  Declaration_codegen(tidecl);
-  assert(getIrGlobal(tidecl)->value != NULL);
-  LLConstant *c = isaConstant(getIrGlobal(tidecl)->value);
-  assert(c != NULL);
+  auto tidecl = getOrCreateTypeInfoDeclaration(Loc(), type);
+  auto tiglobal = DtoResolveTypeInfo(tidecl);
   if (base) {
-    return llvm::ConstantExpr::getBitCast(c, DtoType(getTypeInfoType()));
+    return llvm::ConstantExpr::getBitCast(tiglobal, DtoType(getTypeInfoType()));
   }
-  return c;
+  return tiglobal;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1560,10 +1556,8 @@ DValue *DtoSymbolAddress(Loc &loc, Type *type, Declaration *decl) {
     // typeinfo
     if (TypeInfoDeclaration *tid = vd->isTypeInfoDeclaration()) {
       Logger::println("TypeInfoDeclaration");
-      DtoResolveTypeInfo(tid);
-      assert(getIrValue(tid));
       LLType *vartype = DtoType(type);
-      LLValue *m = getIrValue(tid);
+      LLValue *m = DtoResolveTypeInfo(tid);
       if (m->getType() != getPtrToType(vartype)) {
         m = gIR->ir->CreateBitCast(m, vartype);
       }

gen/toir.cpp

@@ -2669,8 +2669,8 @@ class ToElemVisitor : public Visitor {
 
   void visit(TypeidExp *e) override {
     if (Type *t = isType(e->obj)) {
-      result = DtoSymbolAddress(
-          e->loc, e->type, getOrCreateTypeInfoDeclaration(e->loc, t, nullptr));
+      result = DtoSymbolAddress(e->loc, e->type,
+                                getOrCreateTypeInfoDeclaration(e->loc, t));
       return;
     }
     if (Expression *ex = isExpression(e->obj)) {