replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[LTO] Switch Module to std::unique_ptr<>. 

Differential Revision:   http://reviews.llvm.org/D18994

llvm-svn: 266009
This commit is contained in:
Davide Italiano 2016-04-11 22:39:51 +00:00
parent 1faf01578e
commit 15c41b25c7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lld/ELF/LTO.cpp
View File

@ -140,23 +140,23 @@ static void internalize(GlobalValue &GV) {
// and return the resulting ObjectFile.
std::unique_ptr<InputFile> BitcodeCompiler::compile() {
for (const auto &Name : InternalizedSyms) {
GlobalValue *GV = Combined.getNamedValue(Name.first());
GlobalValue *GV = Combined->getNamedValue(Name.first());
assert(GV);
internalize(*GV);
}
if (Config->SaveTemps)
saveBCFile(Combined, ".lto.bc");
saveBCFile(*Combined, ".lto.bc");
std::unique_ptr<TargetMachine> TM(getTargetMachine());
runLTOPasses(Combined, *TM);
runLTOPasses(*Combined, *TM);
raw_svector_ostream OS(OwningData);
legacy::PassManager CodeGenPasses;
if (TM->addPassesToEmitFile(CodeGenPasses, OS,
TargetMachine::CGFT_ObjectFile))
fatal("failed to setup codegen");
CodeGenPasses.run(Combined);
CodeGenPasses.run(*Combined);
MB = MemoryBuffer::getMemBuffer(OwningData,
"LLD-INTERNAL-combined-lto-object", false);
if (Config->SaveTemps)
@ -165,7 +165,7 @@ std::unique_ptr<InputFile> BitcodeCompiler::compile() {
}
TargetMachine *BitcodeCompiler::getTargetMachine() {
StringRef TripleStr = Combined.getTargetTriple();
StringRef TripleStr = Combined->getTargetTriple();
std::string Msg;
const Target *T = TargetRegistry::lookupTarget(TripleStr, Msg);
if (!T)

7
lld/ELF/LTO.h
View File

@ -39,12 +39,15 @@ public:
void add(BitcodeFile &F);
std::unique_ptr<InputFile> compile();
BitcodeCompiler()
: Combined(new llvm::Module("ld-temp.o", Context)), Mover(*Combined) {}
private:
llvm::TargetMachine *getTargetMachine();
llvm::LLVMContext Context;
llvm::Module Combined{"ld-temp.o", Context};
llvm::IRMover Mover{Combined};
std::unique_ptr<llvm::Module> Combined;
llvm::IRMover Mover;
SmallString<0> OwningData;
std::unique_ptr<MemoryBuffer> MB;
llvm::StringSet<> InternalizedSyms;