diff options
Diffstat (limited to 'llvm/lib/LTO/ThinLTOCodeGenerator.cpp')
| -rw-r--r-- | llvm/lib/LTO/ThinLTOCodeGenerator.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp index 51dcc084b49..f4430081dd9 100644 --- a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp +++ b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp @@ -137,6 +137,7 @@ bool IsFirstDefinitionForLinker(const GlobalValueSummaryList &GVSummaryList, 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) { @@ -163,7 +164,7 @@ ResolveODR(const ModuleSummaryIndex &Index, 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; } @@ -187,6 +188,7 @@ ResolveODR(const ModuleSummaryIndex &Index, 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) @@ -206,7 +208,7 @@ static void ResolveODR( 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; } @@ -681,13 +683,17 @@ void ThinLTOCodeGenerator::promote(Module &TheModule, 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); @@ -841,7 +847,7 @@ void ThinLTOCodeGenerator::run() { // 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. |
