Switch the order of SummaryPath and NewModulePath args.

Author: bd1976bris

llvm/include/llvm/LTO/LTO.h

@@ -249,8 +249,8 @@ class ThinBackendProc {
   // Write sharded indices to SummaryPath, (optionally) imports to disk, and
   // (optionally) record imports in ImportsFiles.
   Error emitFiles(const FunctionImporter::ImportMapTy &ImportList,
-                  StringRef ModulePath, StringRef SummaryPath,
-                  const std::string &NewModulePath,
+                  StringRef ModulePath, const std::string &NewModulePath,
+                  StringRef SummaryPath,
                   std::optional<std::reference_wrapper<ImportsFilesContainer>>
                       ImportsFiles) const;
 };

llvm/lib/LTO/LTO.cpp

@@ -1393,14 +1393,14 @@ SmallVector<const char *> LTO::getRuntimeLibcallSymbols(const Triple &TT) {
 Error ThinBackendProc::emitFiles(
     const FunctionImporter::ImportMapTy &ImportList, llvm::StringRef ModulePath,
     const std::string &NewModulePath) const {
-  return emitFiles(ImportList, ModulePath, NewModulePath + ".thinlto.bc",
-                   NewModulePath,
+  return emitFiles(ImportList, ModulePath, NewModulePath,
+                   NewModulePath + ".thinlto.bc",
                    /*ImportsFiles=*/std::nullopt);
 }
 
 Error ThinBackendProc::emitFiles(
     const FunctionImporter::ImportMapTy &ImportList, llvm::StringRef ModulePath,
-    StringRef SummaryPath, const std::string &NewModulePath,
+    const std::string &NewModulePath, StringRef SummaryPath,
     std::optional<std::reference_wrapper<ImportsFilesContainer>> ImportsFiles)
     const {
   ModuleToSummariesForIndexTy ModuleToSummariesForIndex;
@@ -2281,8 +2281,8 @@ class OutOfProcessThinBackend : public CGThinBackend {
     assert(ModuleToDefinedGVSummaries.count(ModulePath));
     BackendThreadPool.async(
         [=](Job &J, const FunctionImporter::ImportMapTy &ImportList) {
-          if (auto E = emitFiles(ImportList, J.ModuleID, J.SummaryIndexPath,
-                                 J.ModuleID.str(), J.ImportsFiles)) {
+          if (auto E = emitFiles(ImportList, J.ModuleID, J.ModuleID.str(),
+                                 J.SummaryIndexPath, J.ImportsFiles)) {
             std::unique_lock<std::mutex> L(ErrMu);
             if (Err)
               Err = joinErrors(std::move(*Err), std::move(E));