[PATCH] D18994: [LTO] Switch Module to std::unique_ptr<>

[Davide Italiano via llvm-commits]

davide created this revision.
davide added a reviewer: ruiu.
davide added a subscriber: llvm-commits.
Herald added a subscriber: joker.eph.

In preparation for the parallel LTO codegen work (see splitCodeGen in gold-plugin). If it turns out we don't want parallel LTO for the ELF linker, I'll revert this one.


http://reviews.llvm.org/D18994

Files:
  ELF/LTO.cpp
  ELF/LTO.h

Index: ELF/LTO.h
===================================================================
--- ELF/LTO.h
+++ ELF/LTO.h
@@ -39,12 +39,15 @@
   void add(BitcodeFile &F);
   std::unique_ptr<InputFile> compile();
 
+  BitcodeCompiler()
+      : Combined(new llvm::Module("blah", Context)), Mover(*Combined.get()){};
+
 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;
Index: ELF/LTO.cpp
===================================================================
--- ELF/LTO.cpp
+++ ELF/LTO.cpp
@@ -138,32 +138,32 @@
 // 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)
     saveLtoObjectFile(MB->getBuffer());
   return createObjectFile(*MB);
 }
 
 TargetMachine *BitcodeCompiler::getTargetMachine() {
-  StringRef TripleStr = Combined.getTargetTriple();
+  StringRef TripleStr = Combined->getTargetTriple();
   std::string Msg;
   const Target *T = TargetRegistry::lookupTarget(TripleStr, Msg);
   if (!T)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18994.53327.patch
Type: text/x-patch
Size: 2120 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160411/b3d52556/attachment.bin>