diff options
author | Mehdi Amini <mehdi.amini@apple.com> | 2016-03-09 01:37:14 +0000 |
---|---|---|
committer | Mehdi Amini <mehdi.amini@apple.com> | 2016-03-09 01:37:14 +0000 |
commit | bd04e8fed6e89edb6a1c7b9da6dfe6b39564d6f6 (patch) | |
tree | ae2d6dd60808b11fc419bfc9a3ea373ffc6e2543 /llvm/lib | |
parent | 31a5ab9e3bfbf5a3a28a35d281cdacb98814786b (diff) | |
download | bcm5719-llvm-bd04e8fed6e89edb6a1c7b9da6dfe6b39564d6f6.tar.gz bcm5719-llvm-bd04e8fed6e89edb6a1c7b9da6dfe6b39564d6f6.zip |
FunctionIndex is not optional for renameModuleForThinLTO(), make it a reference (NFC)
From: Mehdi Amini <mehdi.amini@apple.com>
llvm-svn: 262976
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/Transforms/IPO/FunctionImport.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/Transforms/Utils/FunctionImportUtils.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index 6b19d92d017..e3ad7bb7280 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -509,7 +509,7 @@ bool ModuleLinker::run() { return true; if (ImportIndex) { - FunctionImportGlobalProcessing ThinLTOProcessing(*SrcM, ImportIndex, + FunctionImportGlobalProcessing ThinLTOProcessing(*SrcM, *ImportIndex, FunctionsToImport); if (ThinLTOProcessing.run()) return true; diff --git a/llvm/lib/Transforms/IPO/FunctionImport.cpp b/llvm/lib/Transforms/IPO/FunctionImport.cpp index 89f3f9d4f48..6589f56511b 100644 --- a/llvm/lib/Transforms/IPO/FunctionImport.cpp +++ b/llvm/lib/Transforms/IPO/FunctionImport.cpp @@ -436,7 +436,7 @@ public: // First we need to promote to global scope and rename any local values that // are potentially exported to other modules. - if (renameModuleForThinLTO(M, Index)) { + if (renameModuleForThinLTO(M, *Index)) { errs() << "Error renaming module\n"; return false; } diff --git a/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp b/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp index b114ad094a1..73069b2c742 100644 --- a/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp +++ b/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp @@ -90,7 +90,7 @@ std::string FunctionImportGlobalProcessing::getName(const GlobalValue *SGV) { (doPromoteLocalToGlobal(SGV) || isPerformingImport())) return FunctionInfoIndex::getGlobalNameForLocal( SGV->getName(), - ImportIndex->getModuleId(SGV->getParent()->getModuleIdentifier())); + ImportIndex.getModuleId(SGV->getParent()->getModuleIdentifier())); return SGV->getName(); } @@ -231,7 +231,7 @@ bool FunctionImportGlobalProcessing::run() { return false; } -bool llvm::renameModuleForThinLTO(Module &M, const FunctionInfoIndex *Index) { +bool llvm::renameModuleForThinLTO(Module &M, const FunctionInfoIndex &Index) { FunctionImportGlobalProcessing ThinLTOProcessing(M, Index); return ThinLTOProcessing.run(); } |