[DTLTO] Code refactor - Fix format errors.

Author: kbelochapka

llvm/include/llvm/DTLTO/DTLTO.h

@@ -321,8 +321,9 @@ class DTLTO : public LTO {
                              ArrayRef<StringRef> RemoteCompilerPrependArgsArg,
                              ArrayRef<StringRef> RemoteCompilerArgsArg,
                              StringRef LinkerOutputFileArg)
-        : LinkerOutputFile(LinkerOutputFileArg), DistributorPath(DistributorArg),
-          DistributorArgs(DistributorArgsArg), RemoteCompiler(RemoteCompilerArg),
+        : LinkerOutputFile(LinkerOutputFileArg),
+          DistributorPath(DistributorArg), DistributorArgs(DistributorArgsArg),
+          RemoteCompiler(RemoteCompilerArg),
           RemoteCompilerPrependArgs(RemoteCompilerPrependArgsArg),
           RemoteCompilerArgs(RemoteCompilerArgsArg) {}
 
@@ -356,8 +357,8 @@ class DTLTO : public LTO {
 
   // Record a file for cleanup and register signal-time removal if requested.
   void addToCleanup(StringRef Filename) {
-      CleanupList.push_back(Filename.str());
-      sys::RemoveFileOnSignal(Filename);
+    CleanupList.push_back(Filename.str());
+    sys::RemoveFileOnSignal(Filename);
   }
 };
 

llvm/include/llvm/LTO/LTO.h

@@ -287,24 +287,24 @@ class ThinBackendProc {
   virtual bool isSensitiveToInputOrder() { return false; }
 
   // Write sharded indices and (optionally) imports to disk
-  LLVM_ABI Error emitFiles(const FunctionImporter::ImportMapTy &ImportList, unsigned Task,
-                           StringRef ModulePath,
+  LLVM_ABI Error emitFiles(const FunctionImporter::ImportMapTy &ImportList,
+                           unsigned Task, StringRef ModulePath,
                            const std::string &NewModulePath) const;
 
   // Write sharded indices to SummaryPath, (optionally) imports to disk, and
   // (optionally) record imports in ImportsFiles. When cache key parameters are
   // provided and GetCacheKeysListRefFunc is set, also computes and stores the
   // LTO cache key for the module.
   LLVM_ABI Error emitFiles(
-      const FunctionImporter::ImportMapTy &ImportList, unsigned Task, StringRef ModulePath,
-      const std::string &NewModulePath, StringRef SummaryPath,
+      const FunctionImporter::ImportMapTy &ImportList, unsigned Task,
+      StringRef ModulePath, const std::string &NewModulePath,
+      StringRef SummaryPath,
       std::optional<std::reference_wrapper<ImportsFilesContainer>> ImportsFiles,
       const FunctionImporter::ExportSetTy *ExportList = nullptr,
-      const std::map<GlobalValue::GUID, GlobalValue::LinkageTypes> *ResolvedODR =
-          nullptr,
+      const std::map<GlobalValue::GUID, GlobalValue::LinkageTypes>
+          *ResolvedODR = nullptr,
       const DenseSet<GlobalValue::GUID> *CfiFunctionDefs = nullptr,
-      const DenseSet<GlobalValue::GUID> *CfiFunctionDecls = nullptr)
-      const;
+      const DenseSet<GlobalValue::GUID> *CfiFunctionDecls = nullptr) const;
 };
 
 /// This callable defines the behavior of a ThinLTO backend after the thin-link
@@ -664,8 +664,6 @@ class LTO {
   addInput(std::unique_ptr<lto::InputFile> InputPtr) {
     return std::shared_ptr<lto::InputFile>(InputPtr.release());
   }
-
-
 };
 
 /// The resolution for a symbol. The linker must provide a SymbolResolution for

llvm/lib/DTLTO/DTLTO.cpp

@@ -54,12 +54,6 @@ Error save(StringRef Buffer, StringRef Path) {
   return Error::success();
 }
 
-// Saves the content of Input to Path overwriting any existing file.
-Error save(lto::InputFile *Input, StringRef Path) {
-  MemoryBufferRef MB = Input->getFileBuffer();
-  return save(MB.getBuffer(), Path);
-}
-
 // Normalize and save a path. Aside from expanding Windows 8.3 short paths,
 // no other normalization is currently required here. These paths are
 // machine-local and break distribution systems; other normalization is

llvm/lib/LTO/LTO.cpp

@@ -1514,23 +1514,23 @@ SmallVector<StringRef> LTO::getLibFuncSymbols(const Triple &TT,
 }
 
 Error ThinBackendProc::emitFiles(
-    const FunctionImporter::ImportMapTy &ImportList, unsigned Task, llvm::StringRef ModulePath,
-    const std::string &NewModulePath) const {
+    const FunctionImporter::ImportMapTy &ImportList, unsigned Task,
+    llvm::StringRef ModulePath, const std::string &NewModulePath) const {
   return emitFiles(ImportList, Task, ModulePath, NewModulePath,
                    NewModulePath + ".thinlto.bc",
                    /*ImportsFiles=*/std::nullopt, nullptr, nullptr, nullptr,
                    nullptr);
 }
 
 Error ThinBackendProc::emitFiles(
-    const FunctionImporter::ImportMapTy &ImportList, unsigned Task, llvm::StringRef ModulePath,
-    const std::string &NewModulePath, StringRef SummaryPath,
+    const FunctionImporter::ImportMapTy &ImportList, unsigned Task,
+    llvm::StringRef ModulePath, const std::string &NewModulePath,
+    StringRef SummaryPath,
     std::optional<std::reference_wrapper<ImportsFilesContainer>> ImportsFiles,
     const FunctionImporter::ExportSetTy *ExportList,
     const std::map<GlobalValue::GUID, GlobalValue::LinkageTypes> *ResolvedODR,
     const DenseSet<GlobalValue::GUID> *CfiFunctionDefs,
-    const DenseSet<GlobalValue::GUID> *CfiFunctionDecls)
-    const {
+    const DenseSet<GlobalValue::GUID> *CfiFunctionDecls) const {
   ModuleToSummariesForIndexTy ModuleToSummariesForIndex;
   GVSummaryPtrSet DeclarationSummaries;
 
@@ -2007,9 +2007,9 @@ class WriteIndexesThinBackend : public ThinBackendProc {
           std::string NewModulePath =
               getThinLTOOutputFile(ModulePath, OldPrefix, NewPrefix);
           auto E = emitFiles(ImportList, Task, ModulePath, NewModulePath,
-                            NewModulePath + ".thinlto.bc",
-                            /*ImportsFiles=*/std::nullopt, &ExportList,
-                            &ResolvedODR, &CfiFunctionDefs, &CfiFunctionDecls);
+                             NewModulePath + ".thinlto.bc",
+                             /*ImportsFiles=*/std::nullopt, &ExportList,
+                             &ResolvedODR, &CfiFunctionDefs, &CfiFunctionDecls);
           if (E) {
             std::unique_lock<std::mutex> L(ErrMu);
             if (Err)

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

@@ -18,8 +18,8 @@
 #include "llvm/ADT/ScopeExit.h"
 #include "llvm/Bitcode/BitcodeReader.h"
 #include "llvm/CodeGen/CommandFlags.h"
-#include "llvm/IR/DiagnosticPrinter.h"
 #include "llvm/DTLTO/DTLTO.h"
+#include "llvm/IR/DiagnosticPrinter.h"
 #include "llvm/LTO/LTO.h"
 #include "llvm/Plugins/PassPlugin.h"
 #include "llvm/Remarks/HotnessThresholdParser.h"