RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-03-07 11:59:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FunctionIndex is not optional for renameModuleForThinLTO(), make it a reference (NFC)

Browse Source 
From: Mehdi Amini <mehdi.amini@apple.com>
llvm-svn: 262976
This commit is contained in:
Mehdi Amini 2016-03-09 01:37:14 +00:00
parent da197122a6
commit bc4b98f89c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/Transforms/Utils/FunctionImportUtils.h
View File

@ -28,7 +28,7 @@ class FunctionImportGlobalProcessing {
Module &M;
/// Function index passed in for function importing/exporting handling.
const FunctionInfoIndex *ImportIndex;
const FunctionInfoIndex &ImportIndex;
/// Functions to import from this module, all other functions will be
/// imported as declarations instead of definitions.
@ -76,7 +76,7 @@ class FunctionImportGlobalProcessing {
public:
FunctionImportGlobalProcessing(
Module &M, const FunctionInfoIndex *Index,
Module &M, const FunctionInfoIndex &Index,
DenseSet<const GlobalValue *> *FunctionsToImport = nullptr)
: M(M), ImportIndex(Index), FunctionsToImport(FunctionsToImport) {
// If we have a FunctionInfoIndex but no function to import,
@ -84,7 +84,7 @@ public:
// backend compilation, and we need to see if it has functions that
// may be exported to another backend compilation.
if (!FunctionsToImport)
HasExportedFunctions = ImportIndex->hasExportedFunctions(M);
HasExportedFunctions = ImportIndex.hasExportedFunctions(M);
}
bool run();
@ -99,7 +99,7 @@ public:
/// Perform in-place global value handling on the given Module for
/// exported local functions renamed and promoted for ThinLTO.
bool renameModuleForThinLTO(Module &M, const FunctionInfoIndex *Index);
bool renameModuleForThinLTO(Module &M, const FunctionInfoIndex &Index);
} // End llvm namespace

2
lib/Linker/LinkModules.cpp
View File

@ -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;

2
lib/Transforms/IPO/FunctionImport.cpp
View File

@ -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;
}

4
lib/Transforms/Utils/FunctionImportUtils.cpp
View File

@ -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();
}