Refactoring: Improve Ir{Aggr,Class,Struct} encapsulation

gen/declarations.cpp

@@ -107,8 +107,7 @@ public:
     // Emit TypeInfo.
     IrClass *ir = getIrAggr(decl);
     if (!ir->suppressTypeInfo()) {
-      llvm::GlobalVariable *interfaceZ = ir->getClassInfoSymbol();
+      ir->getClassInfoSymbol(/*define=*/true);
-      defineGlobal(interfaceZ, ir->getClassInfoInit(), decl);
     }
   }
 
@@ -148,10 +147,7 @@ public:
 
       // Define the __initZ symbol.
       if (!decl->zeroInit) {
-        auto &initZ = ir->getInitSymbol();
+        ir->getInitSymbol(/*define=*/true);
-        auto initGlobal = llvm::cast<LLGlobalVariable>(initZ);
-        initZ = irs->setGlobalVarInitializer(initGlobal, ir->getDefaultInit());
-        setLinkageAndVisibility(decl, initGlobal);
       }
 
       // Emit special __xopEquals/__xopCmp/__xtoHash member functions required
@@ -204,20 +200,15 @@ public:
 
     IrClass *ir = getIrAggr(decl);
 
-    auto &initZ = ir->getInitSymbol();
+    ir->getInitSymbol(/*define=*/true);
-    auto initGlobal = llvm::cast<LLGlobalVariable>(initZ);
-    initZ = irs->setGlobalVarInitializer(initGlobal, ir->getDefaultInit());
-    setLinkageAndVisibility(decl, initGlobal);
 
-    llvm::GlobalVariable *vtbl = ir->getVtblSymbol();
+    ir->getVtblSymbol(/*define*/true);
-    defineGlobal(vtbl, ir->getVtblInit(), decl);
 
     ir->defineInterfaceVtbls();
 
     // Emit TypeInfo.
     if (!ir->suppressTypeInfo()) {
-      llvm::GlobalVariable *classZ = ir->getClassInfoSymbol();
+      ir->getClassInfoSymbol(/*define=*/true);
-      defineGlobal(classZ, ir->getClassInfoInit(), decl);
     }
   }
 

gen/typinf.cpp

@@ -487,13 +487,9 @@ class DeclareOrDefineVisitor : public Visitor {
       return;
     }
 
-    LLConstant *init = irstruct->getTypeInfoInit(); // might define ti!
+    irstruct->getTypeInfoSymbol(/*define=*/true);
-
-    if (!ti->hasInitializer()) {
-      defineGlobal(ti, init, sd);
     ti->setLinkage(TYPEINFO_LINKAGE_TYPE); // override
   }
-  }
 
   // Only declare class TypeInfos. They are defined once in their owning module
   // as part of ClassDeclaration codegen.

ir/iraggr.cpp

@@ -51,19 +51,26 @@ bool IrAggr::suppressTypeInfo() const {
 
 //////////////////////////////////////////////////////////////////////////////
 
-LLConstant *&IrAggr::getInitSymbol() {
+LLConstant *IrAggr::getInitSymbol(bool define) {
-  if (init) {
+  if (!init) {
-    return init;
-  }
-
-  // create the initZ symbol
     const auto irMangle = getIRMangledInitSymbolName(aggrdecl);
 
-  auto initGlobal = declareGlobal(aggrdecl->loc, gIR->module, getLLStructType(),
+    auto initGlobal =
-                                  irMangle, /*isConstant=*/true);
+        declareGlobal(aggrdecl->loc, gIR->module, getLLStructType(), irMangle,
+                      /*isConstant=*/true);
     initGlobal->setAlignment(LLMaybeAlign(DtoAlignment(type)));
 
     init = initGlobal;
+  }
+
+  if (define) {
+    auto initConstant = getDefaultInit();
+    auto initGlobal = llvm::dyn_cast<LLGlobalVariable>(init);
+    if (initGlobal // NOT a bitcast pointer to helper global
+        && !initGlobal->hasInitializer()) {
+      init = gIR->setGlobalVarInitializer(initGlobal, initConstant, aggrdecl);
+    }
+  }
 
   return init;
 }

ir/iraggr.h

@@ -58,7 +58,7 @@ public:
   virtual ~IrAggr() = default;
 
   /// Creates the __initZ symbol lazily.
-  llvm::Constant *&getInitSymbol();
+  llvm::Constant *getInitSymbol(bool define = false);
   /// Builds the __initZ initializer constant lazily.
   llvm::Constant *getDefaultInit();
 
@@ -112,7 +112,9 @@ public:
   explicit IrStruct(StructDeclaration *sd) : IrAggr(sd) {}
 
   /// Creates the TypeInfo_Struct symbol lazily.
-  llvm::GlobalVariable *getTypeInfoSymbol();
+  llvm::GlobalVariable *getTypeInfoSymbol(bool define = false);
+
+private:
   /// Builds the TypeInfo_Struct initializer constant lazily.
   llvm::Constant *getTypeInfoInit();
 };
@@ -123,21 +125,14 @@ public:
   explicit IrClass(ClassDeclaration *cd) : IrAggr(cd) {}
 
   /// Creates the __ClassZ/__InterfaceZ symbol lazily.
-  llvm::GlobalVariable *getClassInfoSymbol();
+  llvm::GlobalVariable *getClassInfoSymbol(bool define = false);
-  /// Builds the __ClassZ/__InterfaceZ initializer constant lazily.
-  llvm::Constant *getClassInfoInit();
 
   /// Creates the __vtblZ symbol lazily.
-  llvm::GlobalVariable *getVtblSymbol();
+  llvm::GlobalVariable *getVtblSymbol(bool define = false);
-  /// Builds the __vtblZ initializer constant lazily.
-  llvm::Constant *getVtblInit();
 
   /// Defines all interface vtbls.
   void defineInterfaceVtbls();
 
-  /// Creates the __interfaceInfos symbol lazily.
-  llvm::GlobalVariable *getInterfaceArraySymbol();
-
   /// Initialize interface.
   void initializeInterface();
 
@@ -162,6 +157,12 @@ private:
   /// Corresponds to the Interface instances needed to be output.
   std::vector<BaseClass *> interfacesWithVtbls;
 
+  /// Builds the __ClassZ/__InterfaceZ initializer constant lazily.
+  llvm::Constant *getClassInfoInit();
+
+  /// Builds the __vtblZ initializer constant lazily.
+  llvm::Constant *getVtblInit();
+
   /// Returns the vtbl for an interface implementation.
   llvm::GlobalVariable *getInterfaceVtblSymbol(BaseClass *b,
                                                size_t interfaces_index);
@@ -169,6 +170,9 @@ private:
   void defineInterfaceVtbl(BaseClass *b, bool new_inst,
                            size_t interfaces_index);
 
+  /// Creates the __interfaceInfos symbol lazily.
+  llvm::GlobalVariable *getInterfaceArraySymbol();
+
   /// Create the Interface[] interfaces ClassInfo field initializer.
   llvm::Constant *getClassInfoInterfaces();
 

ir/irclass.cpp

@@ -41,30 +41,29 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-LLGlobalVariable *IrClass::getVtblSymbol() {
+LLGlobalVariable *IrClass::getVtblSymbol(bool define) {
-  if (vtbl) {
+  if (!vtbl) {
-    return vtbl;
-  }
-
-  // create the vtblZ symbol
     const auto irMangle = getIRMangledVTableSymbolName(aggrdecl);
 
     LLType *vtblTy = stripModifiers(type)->ctype->isClass()->getVtblType();
 
     vtbl = declareGlobal(aggrdecl->loc, gIR->module, vtblTy, irMangle,
                          /*isConstant=*/true);
+  }
+
+  if (define) {
+    auto init = getVtblInit(); // might define vtbl
+    if (!vtbl->hasInitializer())
+      defineGlobal(vtbl, init, aggrdecl);
+  }
 
   return vtbl;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-LLGlobalVariable *IrClass::getClassInfoSymbol() {
+LLGlobalVariable *IrClass::getClassInfoSymbol(bool define) {
-  if (typeInfo) {
+  if (!typeInfo) {
-    return typeInfo;
-  }
-
-  // create the ClassZ / InterfaceZ symbol
     const auto irMangle = getIRMangledClassInfoSymbolName(aggrdecl);
 
     // The type is also ClassInfo for interfaces – the actual TypeInfo for them
@@ -75,7 +74,8 @@ LLGlobalVariable *IrClass::getClassInfoSymbol() {
     IrTypeClass *tc = stripModifiers(cinfoType)->ctype->isClass();
     assert(tc && "invalid ClassInfo type");
 
-  // classinfos cannot be constants since they're used as locks for synchronized
+    // classinfos cannot be constants since they're used as locks for
+    // synchronized
     typeInfo = declareGlobal(aggrdecl->loc, gIR->module, tc->getMemoryLLType(),
                              irMangle, false);
 
@@ -95,14 +95,22 @@ LLGlobalVariable *IrClass::getClassInfoSymbol() {
           llvm::ConstantAsMetadata::get(llvm::UndefValue::get(bodyType));
       mdVals[CD_Finalize] = llvm::ConstantAsMetadata::get(
           LLConstantInt::get(LLType::getInt1Ty(gIR->context()), hasDestructor));
-    mdVals[CD_CustomDelete] = llvm::ConstantAsMetadata::get(
+      mdVals[CD_CustomDelete] =
-        LLConstantInt::get(LLType::getInt1Ty(gIR->context()), hasCustomDelete));
+          llvm::ConstantAsMetadata::get(LLConstantInt::get(
+              LLType::getInt1Ty(gIR->context()), hasCustomDelete));
       // Construct the metadata and insert it into the module.
       const auto metaname = getMetadataName(CD_PREFIX, typeInfo);
       llvm::NamedMDNode *node = gIR->module.getOrInsertNamedMetadata(metaname);
       node->addOperand(llvm::MDNode::get(
           gIR->context(), llvm::makeArrayRef(mdVals, CD_NumFields)));
     }
+  }
+
+  if (define) {
+    auto init = getClassInfoInit();
+    if (!typeInfo->hasInitializer())
+      defineGlobal(typeInfo, init, aggrdecl);
+  }
 
   return typeInfo;
 }

ir/irstruct.cpp

@@ -34,11 +34,8 @@ LLStructType* getTypeInfoStructMemType() {
 }
 }
 
-LLGlobalVariable* IrStruct::getTypeInfoSymbol() {
+LLGlobalVariable* IrStruct::getTypeInfoSymbol(bool define) {
-  if (typeInfo) {
+  if (!typeInfo) {
-    return typeInfo;
-  }
-
     OutBuffer mangledName;
     mangledName.writestring("TypeInfo_S");
     mangleToBuffer(aggrdecl, &mangledName);
@@ -55,6 +52,13 @@ LLGlobalVariable* IrStruct::getTypeInfoSymbol() {
                              getTypeInfoStructMemType(), irMangle, false);
 
     emitTypeInfoMetadata(typeInfo, aggrdecl->type);
+  }
+
+  if (define) {
+    auto init = getTypeInfoInit();
+    if (!typeInfo->hasInitializer())
+      defineGlobal(typeInfo, init, aggrdecl);
+  }
 
   return typeInfo;
 }