From b06cd390c7b479329d3d40b283f1995e10275ff3 Mon Sep 17 00:00:00 2001
From: Nicole Aschenbrenner <nicole.aschenbrenner@amd.com>
Date: Fri, 5 Dec 2025 04:43:07 -0600
Subject: [PATCH] [Clang][Driver] Removes additional nfc divergence

Removes/adds newline changes leading to divergence from trunk.
---
 clang/lib/Driver/Driver.cpp           | 1 +
 clang/lib/Driver/ToolChain.cpp        | 1 +
 clang/lib/Driver/ToolChains/Clang.cpp | 1 +
 clang/lib/Driver/ToolChains/Cuda.h    | 8 ++++++++
 4 files changed, 11 insertions(+)

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index b2989061474f0..e09378e543189 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -1300,6 +1300,7 @@ bool Driver::loadConfigFiles() {
         UserConfigDir = static_cast<std::string>(CfgDir);
     }
   }
+  
   // Prepare list of directories where config file is searched for.
   StringRef CfgFileSearchDirs[] = {UserConfigDir, SystemConfigDir, Dir};
   ExpCtx.setSearchDirs(CfgFileSearchDirs);
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 9871cf4449ec6..5ea711718f4cd 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -669,6 +669,7 @@ Tool *ToolChain::getTool(Action::ActionClass AC) const {
   case Action::OffloadBundlingJobClass:
   case Action::OffloadUnbundlingJobClass:
     return getOffloadBundler();
+
   case Action::OffloadPackagerJobClass:
     return getOffloadPackager();
   case Action::LinkerWrapperJobClass:
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 1d148f3e02692..8fa284a38bc49 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+
 #include "Clang.h"
 #include "AMDGPUOpenMP.h"
 #include "Arch/ARM.h"
diff --git a/clang/lib/Driver/ToolChains/Cuda.h b/clang/lib/Driver/ToolChains/Cuda.h
index 5aa95cf4c5a63..4cfeeedc824b2 100644
--- a/clang/lib/Driver/ToolChains/Cuda.h
+++ b/clang/lib/Driver/ToolChains/Cuda.h
@@ -27,7 +27,9 @@ namespace NVPTX {
 class LLVM_LIBRARY_VISIBILITY Assembler final : public Tool {
 public:
   Assembler(const ToolChain &TC) : Tool("NVPTX::Assembler", "ptxas", TC) {}
+
   bool hasIntegratedCPP() const override { return false; }
+
   void ConstructJob(Compilation &C, const JobAction &JA,
                     const InputInfo &Output, const InputInfoList &Inputs,
                     const llvm::opt::ArgList &TCArgs,
@@ -38,7 +40,9 @@ class LLVM_LIBRARY_VISIBILITY Assembler final : public Tool {
 class LLVM_LIBRARY_VISIBILITY FatBinary : public Tool {
 public:
   FatBinary(const ToolChain &TC) : Tool("NVPTX::Linker", "fatbinary", TC) {}
+
   bool hasIntegratedCPP() const override { return false; }
+
   void ConstructJob(Compilation &C, const JobAction &JA,
                     const InputInfo &Output, const InputInfoList &Inputs,
                     const llvm::opt::ArgList &TCArgs,
@@ -50,6 +54,7 @@ class LLVM_LIBRARY_VISIBILITY Linker final : public Tool {
   Linker(const ToolChain &TC) : Tool("NVPTX::Linker", "nvlink", TC) {}
 
   bool hasIntegratedCPP() const override { return false; }
+
   void ConstructJob(Compilation &C, const JobAction &JA,
                     const InputInfo &Output, const InputInfoList &Inputs,
                     const llvm::opt::ArgList &TCArgs,
@@ -59,7 +64,9 @@ class LLVM_LIBRARY_VISIBILITY OpenMPLinker : public Tool {
  public:
    OpenMPLinker(const ToolChain &TC)
        : Tool("NVPTX::OpenMPLinker", "nvlink", TC) {}
+       
    bool hasIntegratedCPP() const override { return false; }
+
    void ConstructJob(Compilation &C, const JobAction &JA,
                      const InputInfo &Output, const InputInfoList &Inputs,
                      const llvm::opt::ArgList &TCArgs,
@@ -158,6 +165,7 @@ class LLVM_LIBRARY_VISIBILITY CudaToolChain : public NVPTXToolChain {
   void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                            llvm::opt::ArgStringList &CC1Args) const override;
   SanitizerMask getSupportedSanitizers() const override;
+  
   VersionTuple
   computeMSVCVersion(const Driver *D,
                      const llvm::opt::ArgList &Args) const override;