mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update thinLTOInternalizeAndPromoteInIndex() usage

Browse source
This commit is contained in:
Nikita Popov 2019-12-31 14:14:31 +01:00
parent 30ec68a545
commit 8010f4037a
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rustllvm/PassWrapper.cpp
View file

@ -962,6 +962,15 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules,
ExportedGUIDs.insert(GUID); ExportedGUIDs.insert(GUID);
} }
} }
#if LLVM_VERSION_GE(10, 0)
auto isExported = [&](StringRef ModuleIdentifier, ValueInfo VI) {
const auto &ExportList = Ret->ExportLists.find(ModuleIdentifier);
return (ExportList != Ret->ExportLists.end() &&
ExportList->second.count(VI)) ||
ExportedGUIDs.count(VI.getGUID());
};
thinLTOInternalizeAndPromoteInIndex(Ret->Index, isExported, isPrevailing);
#else
auto isExported = [&](StringRef ModuleIdentifier, GlobalValue::GUID GUID) { auto isExported = [&](StringRef ModuleIdentifier, GlobalValue::GUID GUID) {
const auto &ExportList = Ret->ExportLists.find(ModuleIdentifier); const auto &ExportList = Ret->ExportLists.find(ModuleIdentifier);
return (ExportList != Ret->ExportLists.end() && return (ExportList != Ret->ExportLists.end() &&
@ -969,6 +978,7 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules,
ExportedGUIDs.count(GUID); ExportedGUIDs.count(GUID);
}; };
thinLTOInternalizeAndPromoteInIndex(Ret->Index, isExported); thinLTOInternalizeAndPromoteInIndex(Ret->Index, isExported);
#endif
return Ret.release(); return Ret.release();
} }