Cleaned up TypeInfo generation, still need to do TypeInfo_Struct/Tuple. Eventually do ClassInfo and ModuleInfo as well using same interface.

gen/rttibuilder.cpp

@@ -0,0 +1,93 @@
+#include "gen/llvm.h"
+
+#include "aggregate.h"
+#include "mtype.h"
+
+#include "gen/arrays.h"
+#include "gen/irstate.h"
+#include "gen/linkage.h"
+#include "gen/llvmhelpers.h"
+#include "gen/rttibuilder.h"
+#include "gen/tollvm.h"
+
+#include "ir/irstruct.h"
+
+TypeInfoBuilder::TypeInfoBuilder(ClassDeclaration* base_class)
+{
+    // make sure the base typeinfo class has been processed
+    base_class->codegen(Type::sir);
+
+    base = base_class;
+    basetype = (TypeClass*)base->type;
+
+    baseir = base->ir.irStruct;
+    assert(baseir && "no IrStruct for TypeInfo base class");
+
+    // just start with adding the vtbl
+    inits.push_back(baseir->getVtblSymbol());
+    // and monitor
+    push_null_vp();
+}
+
+void TypeInfoBuilder::push(llvm::Constant* C)
+{
+    inits.push_back(C);
+}
+
+void TypeInfoBuilder::push_null_vp()
+{
+    inits.push_back(getNullValue(getVoidPtrType()));
+}
+
+void TypeInfoBuilder::push_typeinfo(Type* t)
+{
+    inits.push_back(DtoTypeInfoOf(t, true));
+}
+
+void TypeInfoBuilder::push_classinfo(ClassDeclaration* cd)
+{
+    inits.push_back(cd->ir.irStruct->getClassInfoSymbol());
+}
+
+void TypeInfoBuilder::push_string(const char* str)
+{
+    inits.push_back(DtoConstString(str));
+}
+
+void TypeInfoBuilder::push_null_void_array()
+{
+    const llvm::Type* T = DtoType(Type::tvoid->arrayOf());
+    inits.push_back(getNullValue(T));
+}
+
+void TypeInfoBuilder::push_void_array(size_t dim, llvm::Constant* ptr)
+{
+    inits.push_back(DtoConstSlice(
+        DtoConstSize_t(dim),
+        DtoBitCast(ptr, getVoidPtrType())));
+}
+
+void TypeInfoBuilder::push_void_array(llvm::Constant* CI, Type* valtype, Dsymbol* sym)
+{
+    std::string initname(sym->mangle());
+    initname.append("13__defaultInitZ");
+
+    LLGlobalVariable* G = new llvm::GlobalVariable(
+        CI->getType(), true, TYPEINFO_LINKAGE_TYPE, CI, initname, gIR->module);
+    G->setAlignment(valtype->alignsize());
+
+    size_t dim = getTypePaddedSize(CI->getType());
+    push_void_array(dim, G);
+}
+
+void TypeInfoBuilder::finalize(IrGlobal* tid)
+{
+    // create the inititalizer
+    LLConstant* tiInit = llvm::ConstantStruct::get(&inits[0], inits.size(), false);
+
+    // refine global type
+    llvm::cast<llvm::OpaqueType>(tid->type.get())->refineAbstractTypeTo(tiInit->getType());
+
+    // set the initializer
+    isaGlobalVar(tid->value)->setInitializer(tiInit);
+}