From 3f38f9715a655958e5219dba42377a2d08a2cd24 Mon Sep 17 00:00:00 2001 From: Martin Date: Sat, 14 Oct 2017 23:22:59 +0200 Subject: [PATCH] Get rid of special 'typeid(...)' LL types for TypeInfos Use the real LL type representing the TypeInfo (sub)class directly and from the beginning, i.e., already for the declaration, instead of building an extra LL struct type (firstly opaque, then finalized when defining the TypeInfo via RTTIBuilder). To get this to work in all cases, the dummy TypeInfo for opaque structs is now a complete TypeInfo_Struct, with all 11/13 fields zero- initialized. Previously, it was a special TypeInfo (no extra TypeInfo_Struct fields) with TypeInfo_Struct vtable, something which DMD also emits. Also refactor the RTTIBuilder finalize() interface - e.g., don't set the linkage there (had to be reverted for ModuleInfos) and only take the global variable to be defined. Cast the field initializers if required, e.g., null pointers to appropriately typed function pointers for TypeInfo_Struct etc. --- gen/moduleinfo.cpp | 3 +- gen/rttibuilder.cpp | 39 +++++---- gen/rttibuilder.h | 4 +- gen/typinf.cpp | 118 ++++++++++++++++----------- tests/codegen/static_typeid_gh1540.d | 9 +- 5 files changed, 97 insertions(+), 76 deletions(-) diff --git a/gen/moduleinfo.cpp b/gen/moduleinfo.cpp index 2b888d8ea3..cf70dd9af3 100644 --- a/gen/moduleinfo.cpp +++ b/gen/moduleinfo.cpp @@ -310,7 +310,6 @@ llvm::GlobalVariable *genModuleInfo(Module *m) { // Create a global symbol with the above initialiser. LLGlobalVariable *moduleInfoSym = getIrModule(m)->moduleInfoSymbol(); - b.finalize(moduleInfoSym->getType()->getPointerElementType(), moduleInfoSym); - setLinkage({LLGlobalValue::ExternalLinkage, false}, moduleInfoSym); + b.finalize(moduleInfoSym); return moduleInfoSym; } diff --git a/gen/rttibuilder.cpp b/gen/rttibuilder.cpp index da90491d2a..96df492c61 100644 --- a/gen/rttibuilder.cpp +++ b/gen/rttibuilder.cpp @@ -150,36 +150,35 @@ void RTTIBuilder::push_funcptr(FuncDeclaration *fd, Type *castto) { } } -void RTTIBuilder::finalize(IrGlobal *tid) { - finalize(tid->getType(), tid->value); -} - -void RTTIBuilder::finalize(LLType *type, LLValue *value) { - llvm::ArrayRef inits = llvm::makeArrayRef(this->inits); - LLStructType *st = isaStruct(type); +void RTTIBuilder::finalize(LLGlobalVariable *gvar) { + LLStructType *st = isaStruct(gvar->getType()->getPointerElementType()); assert(st); - // set struct body + // finalize the type if opaque (e.g., for ModuleInfos) if (st->isOpaque()) { - const int n = inits.size(); - std::vector types; - types.reserve(n); - for (int i = 0; i < n; ++i) { - types.push_back(inits[i]->getType()); + std::vector fieldTypes; + fieldTypes.reserve(inits.size()); + for (auto c : inits) { + fieldTypes.push_back(c->getType()); } - st->setBody(types); + st->setBody(fieldTypes); } - // create the inititalizer - LLConstant *tiInit = LLConstantStruct::get(st, inits); + // create the initializer + LLConstant *tiInit = get_constant(st); // set the initializer - llvm::GlobalVariable *gvar = llvm::cast(value); gvar->setInitializer(tiInit); - setLinkage({TYPEINFO_LINKAGE_TYPE, supportsCOMDAT()}, gvar); } LLConstant *RTTIBuilder::get_constant(LLStructType *initType) { - // just return the inititalizer - return LLConstantStruct::get(initType, inits); + assert(initType->getNumElements() == inits.size()); + + std::vector castInits; + castInits.reserve(inits.size()); + for (unsigned i = 0; i < inits.size(); ++i) { + castInits.push_back(DtoBitCast(inits[i], initType->getElementType(i))); + } + + return LLConstantStruct::get(initType, castInits); } diff --git a/gen/rttibuilder.h b/gen/rttibuilder.h index 981c07daa9..369aa3afae 100644 --- a/gen/rttibuilder.h +++ b/gen/rttibuilder.h @@ -28,6 +28,7 @@ class Type; class TypeClass; namespace llvm { class StructType; +class GlobalVariable; } class RTTIBuilder { @@ -79,8 +80,7 @@ public: Dsymbol *mangle_sym); /// Creates the initializer constant and assigns it to the global. - void finalize(IrGlobal *tid); - void finalize(llvm::Type *type, llvm::Value *value); + void finalize(llvm::GlobalVariable *gvar); /// Creates the initializer constant and assigns it to the global. llvm::Constant *get_constant(llvm::StructType *initType); diff --git a/gen/typinf.cpp b/gen/typinf.cpp index 9d2efd292b..359216bb07 100644 --- a/gen/typinf.cpp +++ b/gen/typinf.cpp @@ -128,7 +128,11 @@ void DtoResolveTypeInfo(TypeInfoDeclaration *tid) { /* ========================================================================= */ class LLVMDefineVisitor : public Visitor { + LLGlobalVariable *const gvar; + public: + LLVMDefineVisitor(LLGlobalVariable *gvar) : gvar(gvar) {} + // Import all functions from class Visitor using Visitor::visit; @@ -140,7 +144,7 @@ public: LOG_SCOPE; RTTIBuilder b(Type::dtypeinfo); - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -175,7 +179,7 @@ public: } // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -189,7 +193,7 @@ public: // TypeInfo base b.push_typeinfo(decl->tinfo->nextOf()); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -203,7 +207,7 @@ public: // TypeInfo base b.push_typeinfo(decl->tinfo->nextOf()); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -225,7 +229,7 @@ public: b.push(DtoConstSize_t(static_cast(tc->dim->toUInteger()))); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -248,7 +252,7 @@ public: b.push_typeinfo(tc->index); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -264,7 +268,7 @@ public: // string deco b.push_string(decl->tinfo->deco); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -283,7 +287,7 @@ public: // string deco b.push_string(decl->tinfo->deco); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -298,10 +302,44 @@ public: TypeStruct *tc = static_cast(decl->tinfo); StructDeclaration *sd = tc->sym; + // On x86_64, class TypeInfo_Struct contains 2 additional fields + // (m_arg1/m_arg2) which are used for the X86_64 System V ABI varargs + // implementation. They are not present on any other cpu/os. + const bool isX86_64 = + global.params.targetTriple->getArch() == llvm::Triple::x86_64; + const unsigned expectedFields = 11 + (isX86_64 ? 2 : 0); + const unsigned actualFields = + Type::typeinfostruct->fields.dim - + 1; // union of xdtor/xdtorti counts as 2 overlapping fields + if (actualFields != expectedFields) { + error(Loc(), "Unexpected number of `object.TypeInfo_Struct` fields; " + "druntime version does not match compiler"); + fatal(); + } + + RTTIBuilder b(Type::typeinfostruct); + // handle opaque structs if (!sd->members) { - RTTIBuilder b(Type::typeinfostruct); - b.finalize(getIrGlobal(decl)); + Logger::println("is opaque struct, emitting dummy TypeInfo_Struct"); + + b.push_null_void_array(); // name + b.push_null_void_array(); // m_init + b.push_null_vp(); // xtoHash + b.push_null_vp(); // xopEquals + b.push_null_vp(); // xopCmp + b.push_null_vp(); // xtoString + b.push_uint(0); // m_flags + b.push_null_vp(); // xdtor/xdtorti + b.push_null_vp(); // xpostblit + b.push_uint(0); // m_align + if (isX86_64) { + b.push_null_vp(); // m_arg1 + b.push_null_vp(); // m_arg2 + } + b.push_null_vp(); // m_RTInfo + + b.finalize(gvar); return; } @@ -343,19 +381,6 @@ public: } IrAggr *iraggr = getIrAggr(sd); - RTTIBuilder b(Type::typeinfostruct); - - // On x86_64, class TypeInfo_Struct contains 2 additional fields - // (m_arg1/m_arg2) which are used for the X86_64 System V ABI varargs - // implementation. They are not present on any other cpu/os. - const bool isX86_64 = - global.params.targetTriple->getArch() == llvm::Triple::x86_64; - const unsigned expectedFields = 12 + (isX86_64 ? 2 : 0); - if (Type::typeinfostruct->fields.dim != expectedFields) { - error(Loc(), "Unexpected number of `object.TypeInfo_Struct` fields; " - "druntime version does not match compiler"); - fatal(); - } // string name b.push_string(sd->toPrettyChars()); @@ -432,7 +457,7 @@ public: } // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -461,7 +486,7 @@ public: b.push_classinfo(tc->sym); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -495,7 +520,7 @@ public: b.push_array(arrC, dim, Type::dtypeinfo->type, nullptr); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -509,7 +534,7 @@ public: // TypeInfo base b.push_typeinfo(decl->tinfo->mutableOf()->merge()); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -523,7 +548,7 @@ public: // TypeInfo base b.push_typeinfo(decl->tinfo->mutableOf()->merge()); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -537,7 +562,7 @@ public: // TypeInfo base b.push_typeinfo(decl->tinfo->unSharedOf()->merge()); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -551,7 +576,7 @@ public: // TypeInfo base b.push_typeinfo(decl->tinfo->mutableOf()->merge()); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } /* ======================================================================= */ @@ -568,7 +593,7 @@ public: // TypeInfo base b.push_typeinfo(tv->basetype); // finish - b.finalize(getIrGlobal(decl)); + b.finalize(gvar); } }; @@ -594,29 +619,22 @@ void TypeInfoDeclaration_codegen(TypeInfoDeclaration *decl, IRState *p) { } const auto irMangle = getIRMangledVarName(mangled, LINKd); - IrGlobal *irg = getIrGlobal(decl, true); - const LinkageWithCOMDAT lwc(LLGlobalValue::ExternalLinkage, false); - - irg->value = gIR->module.getGlobalVariable(irMangle); - if (irg->value) { - assert(irg->getType()->isStructTy()); + LLGlobalVariable *gvar = gIR->module.getGlobalVariable(irMangle); + if (gvar) { + assert(gvar->getType()->getContainedType(0)->isStructTy()); } else { - LLType *type; - if (builtinTypeInfo( - decl->tinfo)) { // this is a declaration of a builtin __initZ var - type = Type::dtypeinfo->type->ctype->isClass()->getMemoryLLType(); - } else { - type = LLStructType::create(gIR->context(), decl->toPrettyChars()); - } + LLType *type = DtoType(decl->type)->getPointerElementType(); // Create the symbol. We need to keep it mutable as the type is not declared // as immutable on the D side, and e.g. synchronized() can be used on the // implicit monitor. - auto g = new LLGlobalVariable(gIR->module, type, false, lwc.first, - nullptr, irMangle); - setLinkage(lwc, g); - irg->value = g; + gvar = + new LLGlobalVariable(gIR->module, type, false, + LLGlobalValue::ExternalLinkage, nullptr, irMangle); } + IrGlobal *irg = getIrGlobal(decl, true); + irg->value = gvar; + emitTypeMetadata(decl); // check if the definition can be elided @@ -626,8 +644,10 @@ void TypeInfoDeclaration_codegen(TypeInfoDeclaration *decl, IRState *p) { } // define the TypeInfo global - LLVMDefineVisitor v; + LLVMDefineVisitor v(gvar); decl->accept(&v); + + setLinkage({TYPEINFO_LINKAGE_TYPE, supportsCOMDAT()}, gvar); } /* ========================================================================= */ diff --git a/tests/codegen/static_typeid_gh1540.d b/tests/codegen/static_typeid_gh1540.d index d5a224c1f9..abf7206b9d 100644 --- a/tests/codegen/static_typeid_gh1540.d +++ b/tests/codegen/static_typeid_gh1540.d @@ -15,11 +15,14 @@ struct S { } -// CHECK: _D{{.*}}classvarC14TypeInfo_Class{{\"?}} = thread_local global %object.TypeInfo_Class* {{.*}}1C7__ClassZ +// CHECK-DAG: _D{{.*}}1C7__ClassZ{{\"?}} = global %object.TypeInfo_Class +// CHECK-DAG: _D{{.*}}classvarC14TypeInfo_Class{{\"?}} = thread_local global %object.TypeInfo_Class* {{.*}}1C7__ClassZ auto classvar = typeid(C); -// CHECK: _D{{.*}}interfacevarC18TypeInfo_Interface{{\"?}} = thread_local global %object.TypeInfo_Interface* {{.*}}TypeInfo_C{{.*}}1I6__initZ +// CHECK-DAG: _D{{.*}}TypeInfo_C{{.*}}1I6__initZ{{\"?}} = linkonce_odr global %object.TypeInfo_Interface +// CHECK-DAG: _D{{.*}}interfacevarC18TypeInfo_Interface{{\"?}} = thread_local global %object.TypeInfo_Interface* {{.*}}TypeInfo_C{{.*}}1I6__initZ auto interfacevar = typeid(I); -// CHECK: _D{{.*}}structvarC15TypeInfo_Struct{{\"?}} = thread_local global %object.TypeInfo_Struct* {{.*}}TypeInfo_S{{.*}}1S6__initZ +// CHECK-DAG: _D{{.*}}TypeInfo_S{{.*}}1S6__initZ{{\"?}} = linkonce_odr global %object.TypeInfo_Struct +// CHECK-DAG: _D{{.*}}structvarC15TypeInfo_Struct{{\"?}} = thread_local global %object.TypeInfo_Struct* {{.*}}TypeInfo_S{{.*}}1S6__initZ auto structvar = typeid(S);