@@ -1633,14 +1633,15 @@ class FirstRoundThinBackend : public InProcessThinBackend {
16331633
16341634public:
16351635 FirstRoundThinBackend (
1636- const Config &Conf, IntrusiveRefCntPtr<vfs::FileSystem> FS, ModuleSummaryIndex &CombinedIndex,
1637- ThreadPoolStrategy ThinLTOParallelism,
1636+ const Config &Conf, IntrusiveRefCntPtr<vfs::FileSystem> FS,
1637+ ModuleSummaryIndex &CombinedIndex, ThreadPoolStrategy ThinLTOParallelism,
16381638 const DenseMap<StringRef, GVSummaryMapTy> &ModuleToDefinedGVSummaries,
16391639 AddStreamFn CGAddStream, FileCache CGCache, AddStreamFn IRAddStream,
16401640 FileCache IRCache)
1641- : InProcessThinBackend(Conf, std::move(FS), CombinedIndex, ThinLTOParallelism,
1642- ModuleToDefinedGVSummaries, std::move(CGAddStream),
1643- std::move (CGCache), /* OnWrite=*/ nullptr,
1641+ : InProcessThinBackend(Conf, std::move(FS), CombinedIndex,
1642+ ThinLTOParallelism, ModuleToDefinedGVSummaries,
1643+ std::move (CGAddStream), std::move(CGCache),
1644+ /* OnWrite=*/ nullptr,
16441645 /* ShouldEmitIndexFiles=*/ false,
16451646 /* ShouldEmitImportsFiles=*/ false),
16461647 IRAddStream(std::move(IRAddStream)), IRCache(std::move(IRCache)) {}
@@ -1728,15 +1729,15 @@ class SecondRoundThinBackend : public InProcessThinBackend {
17281729
17291730public:
17301731 SecondRoundThinBackend (
1731- const Config &Conf, IntrusiveRefCntPtr<vfs::FileSystem> FS, ModuleSummaryIndex &CombinedIndex,
1732- ThreadPoolStrategy ThinLTOParallelism,
1732+ const Config &Conf, IntrusiveRefCntPtr<vfs::FileSystem> FS,
1733+ ModuleSummaryIndex &CombinedIndex, ThreadPoolStrategy ThinLTOParallelism,
17331734 const DenseMap<StringRef, GVSummaryMapTy> &ModuleToDefinedGVSummaries,
17341735 AddStreamFn AddStream, FileCache Cache,
17351736 std::unique_ptr<SmallVector<StringRef>> IRFiles,
17361737 stable_hash CombinedCGDataHash)
1737- : InProcessThinBackend(Conf, std::move(FS), CombinedIndex, ThinLTOParallelism,
1738- ModuleToDefinedGVSummaries, std::move(AddStream) ,
1739- std::move (Cache),
1738+ : InProcessThinBackend(Conf, std::move(FS), CombinedIndex,
1739+ ThinLTOParallelism, ModuleToDefinedGVSummaries ,
1740+ std::move (AddStream), std::move( Cache),
17401741 /* OnWrite=*/ nullptr,
17411742 /* ShouldEmitIndexFiles=*/ false,
17421743 /* ShouldEmitImportsFiles=*/ false),
@@ -1758,8 +1759,8 @@ class SecondRoundThinBackend : public InProcessThinBackend {
17581759 std::unique_ptr<Module> LoadedModule =
17591760 cgdata::loadModuleForTwoRounds (BM, Task, BackendContext, *IRFiles);
17601761
1761- return thinBackend (Conf, FS, Task, AddStream, *LoadedModule, CombinedIndex,
1762- ImportList, DefinedGlobals, &ModuleMap,
1762+ return thinBackend (Conf, FS, Task, AddStream, *LoadedModule,
1763+ CombinedIndex, ImportList, DefinedGlobals, &ModuleMap,
17631764 /* CodeGenOnly=*/ true );
17641765 };
17651766 if (!Cache.isValid () || !CombinedIndex.modulePaths ().count (ModuleID) ||
@@ -1850,14 +1851,15 @@ class WriteIndexesThinBackend : public ThinBackendProc {
18501851
18511852public:
18521853 WriteIndexesThinBackend (
1853- const Config &Conf, IntrusiveRefCntPtr<vfs::FileSystem> FS, ModuleSummaryIndex &CombinedIndex,
1854- ThreadPoolStrategy ThinLTOParallelism,
1854+ const Config &Conf, IntrusiveRefCntPtr<vfs::FileSystem> FS,
1855+ ModuleSummaryIndex &CombinedIndex, ThreadPoolStrategy ThinLTOParallelism,
18551856 const DenseMap<StringRef, GVSummaryMapTy> &ModuleToDefinedGVSummaries,
18561857 std::string OldPrefix, std::string NewPrefix,
18571858 std::string NativeObjectPrefix, bool ShouldEmitImportsFiles,
18581859 raw_fd_ostream *LinkedObjectsFile, lto::IndexWriteCallback OnWrite)
1859- : ThinBackendProc(Conf, std::move(FS), CombinedIndex, ModuleToDefinedGVSummaries,
1860- OnWrite, ShouldEmitImportsFiles, ThinLTOParallelism),
1860+ : ThinBackendProc(Conf, std::move(FS), CombinedIndex,
1861+ ModuleToDefinedGVSummaries, OnWrite,
1862+ ShouldEmitImportsFiles, ThinLTOParallelism),
18611863 OldPrefix (OldPrefix), NewPrefix(NewPrefix),
18621864 NativeObjectPrefix(NativeObjectPrefix),
18631865 LinkedObjectsFile(LinkedObjectsFile) {}
@@ -2288,17 +2290,18 @@ class OutOfProcessThinBackend : public CGThinBackend {
22882290
22892291public:
22902292 OutOfProcessThinBackend (
2291- const Config &Conf, IntrusiveRefCntPtr<vfs::FileSystem> FS, ModuleSummaryIndex &CombinedIndex,
2292- ThreadPoolStrategy ThinLTOParallelism,
2293+ const Config &Conf, IntrusiveRefCntPtr<vfs::FileSystem> FS,
2294+ ModuleSummaryIndex &CombinedIndex, ThreadPoolStrategy ThinLTOParallelism,
22932295 const DenseMap<StringRef, GVSummaryMapTy> &ModuleToDefinedGVSummaries,
22942296 AddStreamFn AddStream, lto::IndexWriteCallback OnWrite,
22952297 bool ShouldEmitIndexFiles, bool ShouldEmitImportsFiles,
22962298 StringRef LinkerOutputFile, StringRef Distributor,
22972299 ArrayRef<StringRef> DistributorArgs, StringRef RemoteCompiler,
22982300 ArrayRef<StringRef> RemoteCompilerArgs, bool SaveTemps)
2299- : CGThinBackend(Conf, std::move(FS), CombinedIndex, ModuleToDefinedGVSummaries,
2300- AddStream, OnWrite, ShouldEmitIndexFiles,
2301- ShouldEmitImportsFiles, ThinLTOParallelism),
2301+ : CGThinBackend(Conf, std::move(FS), CombinedIndex,
2302+ ModuleToDefinedGVSummaries, AddStream, OnWrite,
2303+ ShouldEmitIndexFiles, ShouldEmitImportsFiles,
2304+ ThinLTOParallelism),
23022305 LinkerOutputFile (LinkerOutputFile), DistributorPath(Distributor),
23032306 DistributorArgs(DistributorArgs), RemoteCompiler(RemoteCompiler),
23042307 RemoteCompilerArgs(RemoteCompilerArgs), SaveTemps(SaveTemps) {}
0 commit comments