mirror of
https://github.com/ldc-developers/ldc.git
synced 2025-05-05 01:20:51 +03:00
Emit struct TypeInfos & special member functions in owning module only
Analogous to ClassInfos, incl. normal linkage (external for non- templates, weak_odr for templates). This enables to get rid of frontend logic wrt. whether to add TypeInfoStructDeclarations to a module's members tree - previously, it was defined as linkonce_odr in the owning module and each referencing module (unless speculative) - and related extra semantic and codegen for the special member functions. I've gone a bit further and moved the entire TypeInfo emission for LDC to the codegen layer; no TypeInfoDeclarations are added to the module members anymore. Whenever we need a TypeInfo symbol during codegen, it is declared or defined, and we don't need to rely on brittle frontend logic with speculative-ness complications. This might slightly increase compilation speed due to less emitted TypeInfos and functions (possibly less work for the linker too). A slight drawback is that the job of stripping unused struct TypeInfos is fully delegated to the linker, as the TypeInfo is guaranteed to end up in the owning object file due to no linkonce_odr. Another theoretical drawback is that the optimizer can definitely not inline xtoHash/xopEquals/xopCmp/xtoString/xdtor[ti]/xpostblit function pointer indirections in non-owning CUs without LTO (neither the pointers nor the special member functions are defined anymore). These (public) members are probably hardly used directly though, and instead used by the virtual TypeInfo_Struct methods equals/compare/ getHash/destroy/postblit, which are exclusively defined in druntime's object.o (incl. the TypeInfo_Struct vtable) and aren't cross-module- inlined anyway (without LTO). Re-emitting the struct TypeInfos (and optionally the special member functions too) into each referencing CU could be handled in our codegen layer, which should be much simpler and more robust than the upstream scheme.
This commit is contained in:
parent
555f3ba233
commit
64aa4fe1e3
11 changed files with 124 additions and 160 deletions
|
@ -60,14 +60,14 @@
|
|||
void genTypeInfo(Loc loc, Type *torig, Scope *sc);
|
||||
bool builtinTypeInfo(Type *t);
|
||||
|
||||
TypeInfoDeclaration *getOrCreateTypeInfoDeclaration(const Loc &loc, Type *torig,
|
||||
Scope *sc) {
|
||||
IF_LOG Logger::println("Type::getTypeInfo(): %s", torig->toChars());
|
||||
TypeInfoDeclaration *getOrCreateTypeInfoDeclaration(const Loc &loc, Type *forType) {
|
||||
IF_LOG Logger::println("getOrCreateTypeInfoDeclaration(): %s",
|
||||
forType->toChars());
|
||||
LOG_SCOPE
|
||||
|
||||
genTypeInfo(loc, torig, sc);
|
||||
genTypeInfo(loc, forType, nullptr);
|
||||
|
||||
return torig->vtinfo;
|
||||
return forType->vtinfo;
|
||||
}
|
||||
|
||||
/* ========================================================================= */
|
||||
|
@ -105,23 +105,6 @@ void emitTypeInfoMetadata(LLGlobalVariable *typeinfoGlobal, Type *forType) {
|
|||
}
|
||||
}
|
||||
|
||||
void DtoResolveTypeInfo(TypeInfoDeclaration *tid) {
|
||||
if (tid->ir->isResolved()) {
|
||||
return;
|
||||
}
|
||||
tid->ir->setResolved();
|
||||
|
||||
// TypeInfo instances (except ClassInfo ones) are always emitted as weak
|
||||
// symbols when they are used. We call semanticTypeInfo() to make sure
|
||||
// that the type (e.g. for structs) is semantic3'd and codegen() does not
|
||||
// skip it on grounds of being speculative, as DtoResolveTypeInfo() means
|
||||
// that we actually need the value somewhere else in codegen.
|
||||
// TODO: DMD does not seem to call semanticTypeInfo() from the glue layer,
|
||||
// so there might be a structural issue somewhere.
|
||||
semanticTypeInfo(nullptr, tid->tinfo);
|
||||
Declaration_codegen(tid);
|
||||
}
|
||||
|
||||
/* ========================================================================= */
|
||||
|
||||
namespace {
|
||||
|
@ -471,8 +454,7 @@ void buildTypeInfo(TypeInfoDeclaration *decl) {
|
|||
|
||||
// check if the definition can be elided
|
||||
if (gvar->hasInitializer() || !global.params.useTypeInfo ||
|
||||
!Type::dtypeinfo || isSpeculativeType(forType) ||
|
||||
builtinTypeInfo(forType)) {
|
||||
!Type::dtypeinfo || builtinTypeInfo(forType)) {
|
||||
return;
|
||||
}
|
||||
if (auto forClassType = forType->isTypeClass()) {
|
||||
|
@ -491,28 +473,12 @@ void buildTypeInfo(TypeInfoDeclaration *decl) {
|
|||
class DeclareOrDefineVisitor : public Visitor {
|
||||
using Visitor::visit;
|
||||
|
||||
// Define struct TypeInfos as linkonce_odr in each referencing CU.
|
||||
// Only declare struct TypeInfos. They are defined once in their owning module
|
||||
// as part of StructDeclaration codegen.
|
||||
void visit(TypeInfoStructDeclaration *decl) override {
|
||||
auto forType = decl->tinfo->isTypeStruct();
|
||||
|
||||
auto irstruct = getIrAggr(forType->sym, true);
|
||||
auto gvar = irstruct->getTypeInfoSymbol();
|
||||
|
||||
auto irstruct = getIrAggr(decl->tinfo->isTypeStruct()->sym, true);
|
||||
IrGlobal *irg = getIrGlobal(decl, true);
|
||||
irg->value = gvar;
|
||||
|
||||
// check if the definition can be elided
|
||||
if (gvar->hasInitializer() || irstruct->suppressTypeInfo() ||
|
||||
isSpeculativeType(forType)) {
|
||||
return;
|
||||
}
|
||||
|
||||
LLConstant *init = irstruct->getTypeInfoInit(); // might define gvar!
|
||||
|
||||
if (!gvar->hasInitializer()) {
|
||||
defineGlobal(gvar, init, irstruct->aggrdecl);
|
||||
gvar->setLinkage(TYPEINFO_LINKAGE_TYPE); // override
|
||||
}
|
||||
irg->value = irstruct->getTypeInfoSymbol();
|
||||
}
|
||||
|
||||
// Only declare class TypeInfos. They are defined once in their owning module
|
||||
|
@ -526,17 +492,22 @@ class DeclareOrDefineVisitor : public Visitor {
|
|||
}
|
||||
|
||||
// Build all other TypeInfos.
|
||||
void visit(TypeInfoDeclaration *decl) override {
|
||||
buildTypeInfo(decl);
|
||||
}
|
||||
void visit(TypeInfoDeclaration *decl) override { buildTypeInfo(decl); }
|
||||
};
|
||||
} // anonymous namespace
|
||||
|
||||
void TypeInfoDeclaration_codegen(TypeInfoDeclaration *decl) {
|
||||
IF_LOG Logger::println("TypeInfoDeclaration_codegen(%s)",
|
||||
decl->toPrettyChars());
|
||||
LLGlobalVariable *DtoResolveTypeInfo(TypeInfoDeclaration *tid) {
|
||||
IF_LOG Logger::println("DtoResolveTypeInfo(%s)", tid->toPrettyChars());
|
||||
LOG_SCOPE;
|
||||
|
||||
DeclareOrDefineVisitor v;
|
||||
decl->accept(&v);
|
||||
assert(!gIR->dcomputetarget);
|
||||
|
||||
if (!tid->ir->isResolved()) {
|
||||
tid->ir->setResolved();
|
||||
|
||||
DeclareOrDefineVisitor v;
|
||||
tid->accept(&v);
|
||||
}
|
||||
|
||||
return llvm::cast<LLGlobalVariable>(getIrValue(tid));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue