[DTLTO] Code refactor - addressed Teresa review comments. #2

Author: kbelochapka

lld/COFF/LTO.cpp

@@ -126,7 +126,7 @@ BitcodeCompiler::BitcodeCompiler(COFFLinkerContext &c) : ctx(c) {
 
   // Initialize ltoObj.
   lto::ThinBackend backend;
-  if (ctx.config.thinLTOIndexOnly || !ctx.config.dtltoDistributor.empty()) {
+  if (ctx.config.thinLTOIndexOnly) {
     auto OnIndexWrite = [&](StringRef S) { thinIndices.erase(S); };
     backend = lto::createWriteIndexesThinBackend(
         llvm::hardware_concurrency(ctx.config.thinLTOJobs),
@@ -144,7 +144,7 @@ BitcodeCompiler::BitcodeCompiler(COFFLinkerContext &c) : ctx(c) {
                                         ctx.config.ltoPartitions);
   else
     ltoObj = std::make_unique<lto::DTLTO>(
-        createConfig(), backend, ctx.config.ltoPartitions,
+        createConfig(), ctx.config.ltoPartitions,
         llvm::lto::LTO::LTOKind::LTOK_Default, nullptr,
         ctx.config.thinLTOEmitImportsFiles, ctx.config.thinLTOIndexOnly,
         ctx.config.outputFile, ctx.config.dtltoDistributor,

lld/ELF/LTO.cpp

@@ -184,7 +184,7 @@ BitcodeCompiler::BitcodeCompiler(Ctx &ctx) : ctx(ctx) {
   // Initialize ltoObj.
   lto::ThinBackend backend;
   auto onIndexWrite = [&](StringRef s) { thinIndices.erase(s); };
-  if (ctx.arg.thinLTOIndexOnly || !ctx.arg.dtltoDistributor.empty()) {
+  if (ctx.arg.thinLTOIndexOnly) {
     backend = lto::createWriteIndexesThinBackend(
         llvm::hardware_concurrency(ctx.arg.thinLTOJobs),
         std::string(ctx.arg.thinLTOPrefixReplaceOld),
@@ -209,8 +209,8 @@ BitcodeCompiler::BitcodeCompiler(Ctx &ctx) : ctx(ctx) {
                                         ltoModes[ctx.arg.ltoKind]);
   else
     ltoObj = std::make_unique<lto::DTLTO>(
-        createConfig(ctx), backend, ctx.arg.ltoPartitions,
-        ltoModes[ctx.arg.ltoKind], onIndexWrite, ctx.arg.thinLTOEmitIndexFiles,
+        createConfig(ctx), ctx.arg.ltoPartitions, ltoModes[ctx.arg.ltoKind],
+        onIndexWrite, ctx.arg.thinLTOEmitIndexFiles,
         ctx.arg.thinLTOEmitImportsFiles, ctx.arg.outputFile,
         ctx.arg.dtltoDistributor, ctx.arg.dtltoDistributorArgs,
         ctx.arg.dtltoCompiler, ctx.arg.dtltoCompilerPrependArgs,

llvm/include/llvm/DTLTO/DTLTO.h

@@ -47,17 +47,15 @@ class DTLTO : public LTO {
   using Base = LTO;
 
 public:
-  LLVM_ABI DTLTO(Config Conf, ThinBackend Backend,
-                 unsigned ParallelCodeGenParallelismLevel, LTOKind LTOMode,
-                 IndexWriteCallback OnWrite, bool EmitIndexFiles,
-                 bool EmitImportsFiles, StringRef LinkerOutputFile,
-                 StringRef Distributor, ArrayRef<StringRef> DistributorArgs,
-                 StringRef RemoteCompiler,
+  LLVM_ABI DTLTO(Config Conf, unsigned ParallelCodeGenParallelismLevel,
+                 LTOKind LTOMode, IndexWriteCallback OnWrite,
+                 bool EmitIndexFiles, bool EmitImportsFiles,
+                 StringRef LinkerOutputFile, StringRef Distributor,
+                 ArrayRef<StringRef> DistributorArgs, StringRef RemoteCompiler,
                  ArrayRef<StringRef> RemoteCompilerPrependArgs,
                  ArrayRef<StringRef> RemoteCompilerArgs,
                  AddBufferFn AddBufferArg, bool SaveTempsArg)
-      : Base(std::move(Conf), Backend, ParallelCodeGenParallelismLevel,
-             LTOMode),
+      : Base(std::move(Conf), {}, ParallelCodeGenParallelismLevel, LTOMode),
         AddBuffer(AddBufferArg), SaveTemps(SaveTempsArg),
         ShouldEmitIndexFiles(EmitIndexFiles),
         ShouldEmitImportFiles(EmitImportsFiles), OnWriteCb(OnWrite),

llvm/lib/LTO/LTO.cpp

@@ -1299,7 +1299,7 @@ Error LTO::checkPartiallySplit() {
 }
 
 Error LTO::run(AddStreamFn AddStream, FileCache Cache) {
-  llvm::scope_exit CleanUp([this]() { cleanup(); });
+  llvm::scope_exit CleanUp([this]() { LTO::cleanup(); });
 
   // Compute "dead" symbols, we don't want to import/export these!
   DenseSet<GlobalValue::GUID> GUIDPreservedSymbols;

llvm/tools/llvm-lto2/llvm-lto2.cpp

@@ -444,7 +444,7 @@ static int run(int argc, char **argv) {
   };
 
   ThinBackend Backend;
-  if (ThinLTODistributedIndexes || !DTLTODistributor.empty())
+  if (ThinLTODistributedIndexes)
     Backend = createWriteIndexesThinBackend(llvm::hardware_concurrency(Threads),
                                             /*OldPrefix=*/"",
                                             /*NewPrefix=*/"",
@@ -478,10 +478,10 @@ static int run(int argc, char **argv) {
   std::unique_ptr<LTO> Lto;
   if (!DTLTODistributor.empty()) {
     Lto = std::make_unique<DTLTO>(
-        std::move(Conf), std::move(Backend), 1, LTOMode, nullptr,
-        ThinLTOEmitIndexes, ThinLTOEmitImports, OutputFilename,
-        DTLTODistributor, DTLTODistributorArgsSV, DTLTOCompiler,
-        DTLTOCompilerPrependArgsSV, DTLTOCompilerArgsSV, AddBuffer, SaveTemps);
+        std::move(Conf), 1, LTOMode, nullptr, ThinLTOEmitIndexes,
+        ThinLTOEmitImports, OutputFilename, DTLTODistributor,
+        DTLTODistributorArgsSV, DTLTOCompiler, DTLTOCompilerPrependArgsSV,
+        DTLTOCompilerArgsSV, AddBuffer, SaveTemps);
   } else {
     Lto =
         std::make_unique<LTO>(std::move(Conf), std::move(Backend), 1, LTOMode);