D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-19 14:23:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for issue #535.

Browse Source 
The symbols must have weak_odr linkage if they result from a template instantiation.
This commit is contained in:
kai
2013-11-03 22:06:49 +01:00
parent 8408afcf6d
commit 8d7f0bf0eb
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gen/tollvm.cpp
View File

@@ -454,11 +454,11 @@ llvm::GlobalValue::LinkageTypes DtoInternalLinkage(Dsymbol* sym)
return llvm::GlobalValue::InternalLinkage;
}
llvm::GlobalValue::LinkageTypes DtoExternalLinkage(Dsymbol* sym)
llvm::GlobalValue::LinkageTypes DtoExternalLinkage(Dsymbol* sym, bool checkInline)
{
if (DtoIsTemplateInstance(sym))
return templateLinkage;
else if (isAvailableExternally(sym))
else if (checkInline && isAvailableExternally(sym))
return llvm::GlobalValue::AvailableExternallyLinkage;
else
return llvm::GlobalValue::ExternalLinkage;

2
gen/tollvm.h
View File

@@ -58,7 +58,7 @@ LLValue* DtoDelegateEquals(TOK op, LLValue* lhs, LLValue* rhs);
// return linkage type for symbol using the current ir state for context
LLGlobalValue::LinkageTypes DtoLinkage(Dsymbol* sym);
LLGlobalValue::LinkageTypes DtoInternalLinkage(Dsymbol* sym);
LLGlobalValue::LinkageTypes DtoExternalLinkage(Dsymbol* sym);
LLGlobalValue::LinkageTypes DtoExternalLinkage(Dsymbol* sym, bool checkInline = true);
// some types
LLIntegerType* DtoSize_t();

6
ir/irclass.cpp
View File

@@ -293,8 +293,10 @@ llvm::GlobalVariable * IrAggr::getInterfaceVtbl(BaseClass * b, bool new_instance
DtoConstSize_t(interfaces_index)
};
llvm::GlobalVariable* interfaceInfosZ = getInterfaceArraySymbol();
interfaceInfosZ->setLinkage(DtoExternalLinkage(cd, false));
llvm::Constant* c = llvm::ConstantExpr::getGetElementPtr(
getInterfaceArraySymbol(), idxs, true);
interfaceInfosZ, idxs, true);
constants.push_back(c);
}
@@ -389,7 +391,7 @@ llvm::GlobalVariable * IrAggr::getInterfaceVtbl(BaseClass * b, bool new_instance
*gIR->module,
vtbl_constant->getType(),
true,
llvm::GlobalValue::ExternalLinkage,
DtoExternalLinkage(cd, false),
vtbl_constant,
mangle
);