static GlobalValue::LinkageTypes
ResolveODR(const ModuleSummaryIndex &Index,
const FunctionImporter::ExportSetTy &ExportList,
+ const DenseSet<GlobalValue::GUID> &GUIDPreservedSymbols,
StringRef ModuleIdentifier, GlobalValue::GUID GUID,
const GlobalValueSummary &GV) {
auto HasMultipleCopies = [&](const GlobalValueSummaryList &GVSummaryList) {
if (!HasMultipleCopies(GVSummaryList)) {
// Exported LinkonceODR needs to be promoted to not be discarded
if (GlobalValue::isDiscardableIfUnused(OriginalLinkage) &&
- ExportList.count(GUID))
+ (ExportList.count(GUID) || GUIDPreservedSymbols.count(GUID)))
return GlobalValue::WeakODRLinkage;
break;
}
static void ResolveODR(
const ModuleSummaryIndex &Index,
const FunctionImporter::ExportSetTy &ExportList,
+ const DenseSet<GlobalValue::GUID> &GUIDPreservedSymbols,
const GVSummaryMapTy &DefinedGlobals, StringRef ModuleIdentifier,
std::map<GlobalValue::GUID, GlobalValue::LinkageTypes> &ResolvedODR) {
if (Index.modulePaths().size() == 1)
if (GlobalInvolvedWithAlias.count(GV.second))
continue;
auto NewLinkage =
- ResolveODR(Index, ExportList, ModuleIdentifier, GV.first, *GV.second);
+ ResolveODR(Index, ExportList, GUIDPreservedSymbols, ModuleIdentifier, GV.first, *GV.second);
if (NewLinkage != GV.second->linkage()) {
ResolvedODR[GV.first] = NewLinkage;
}
ExportLists);
auto &ExportList = ExportLists[ModuleIdentifier];
+ // Convert the preserved symbols set from string to GUID
+ auto GUIDPreservedSymbols =
+ computeGUIDPreservedSymbols(PreservedSymbols, TMBuilder.TheTriple);
+
// Resolve the LinkOnceODR, trying to turn them into "available_externally"
// where possible.
// This is a compile-time optimization.
// We use a std::map here to be able to have a defined ordering when
// producing a hash for the cache entry.
std::map<GlobalValue::GUID, GlobalValue::LinkageTypes> ResolvedODR;
- ResolveODR(Index, ExportList, ModuleToDefinedGVSummaries[ModuleIdentifier],
+ ResolveODR(Index, ExportList, GUIDPreservedSymbols, ModuleToDefinedGVSummaries[ModuleIdentifier],
ModuleIdentifier, ResolvedODR);
fixupODR(TheModule, ResolvedODR);
// We use a std::map here to be able to have a defined ordering when
// producing a hash for the cache entry.
std::map<GlobalValue::GUID, GlobalValue::LinkageTypes> ResolvedODR;
- ResolveODR(*Index, ExportList, DefinedFunctions, ModuleIdentifier,
+ ResolveODR(*Index, ExportList, GUIDPreservedSymbols, DefinedFunctions, ModuleIdentifier,
ResolvedODR);
// The module may be cached, this helps handling it.
; Verify that only one ODR is selected across modules, but non ODR are not affected.
; RUN: llvm-lto -thinlto-action=promote %t.bc -thinlto-index=%t3.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=MOD1
; RUN: llvm-lto -thinlto-action=promote %t2.bc -thinlto-index=%t3.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=MOD2
+; When exported, we always preserve a linkonce
+; RUN: llvm-lto -thinlto-action=promote %t.bc -thinlto-index=%t3.bc -o - --exported-symbol=linkonceodrfuncInSingleModule | llvm-dis -o - | FileCheck %s --check-prefix=EXPORTED
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.11.0"
ret void
}
+; MOD1: define linkonce_odr void @linkonceodrfuncInSingleModule()
+; EXPORTED: define weak_odr void @linkonceodrfuncInSingleModule()
+define linkonce_odr void @linkonceodrfuncInSingleModule() #0 {
+entry:
+ ret void
+}