clang-format

Author: Meinersbur

clang/include/clang/Driver/Driver.h

@@ -403,10 +403,10 @@ class Driver {
                               SmallString<128> &CrashDiagDir);
 
 public:
-
   /// Takes the path to a binary that's either in bin/ or lib/ and returns
   /// the path to clang's resource directory.
-  /// Do not pass argv[0] as argument, llvm-lit does not adjust argv[0] to the changing cwd. Use llvm::sys::fs::getMainExecutable instead.
+  /// Do not pass argv[0] as argument, llvm-lit does not adjust argv[0] to the
+  /// changing cwd. Use llvm::sys::fs::getMainExecutable instead.
   static std::string GetResourcesPath(StringRef BinaryPath);
 
   Driver(StringRef ClangExecutable, StringRef TargetTriple,

clang/include/clang/Driver/ToolChain.h

@@ -542,11 +542,9 @@ class ToolChain {
   // Returns Triple without the OSs version.
   llvm::Triple getTripleWithoutOSVersion() const;
 
-
- /// Returns the target-specific path for Flang's intrinsic modules in the resource directory if it exists.
-    std::optional<std::string>  getDefaultIntrinsicModuleDir(  ) const;
-
-
+  /// Returns the target-specific path for Flang's intrinsic modules in the
+  /// resource directory if it exists.
+  std::optional<std::string> getDefaultIntrinsicModuleDir() const;
 
   // Returns the target specific runtime path if it exists.
   std::optional<std::string> getRuntimePath() const;

clang/lib/Driver/Driver.cpp

@@ -6537,13 +6537,14 @@ std::string Driver::GetFilePath(StringRef Name, const ToolChain &TC) const {
   if (llvm::sys::fs::exists(Twine(P)))
     return std::string(P);
 
-    if (IsFlangMode()) {
-      if (std::optional<std::string> IntrPath =   TC.getDefaultIntrinsicModuleDir ()) {
-          SmallString<128> P(*IntrPath);
-  llvm::sys::path::append(P, Name);
-  if (llvm::sys::fs::exists(Twine(P)))
-    return std::string(P);
-}
+  if (IsFlangMode()) {
+    if (std::optional<std::string> IntrPath =
+            TC.getDefaultIntrinsicModuleDir()) {
+      SmallString<128> P(*IntrPath);
+      llvm::sys::path::append(P, Name);
+      if (llvm::sys::fs::exists(Twine(P)))
+        return std::string(P);
+    }
   }
 
   SmallString<128> D(Dir);

clang/lib/Driver/ToolChain.cpp

@@ -983,10 +983,10 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
   return {};
 }
 
-std::optional< std::string> ToolChain::getDefaultIntrinsicModuleDir(  ) const {
+std::optional<std::string> ToolChain::getDefaultIntrinsicModuleDir() const {
   SmallString<128> P(D.ResourceDir);
   llvm::sys::path::append(P, "finclude");
-  return  getTargetSubDirPath(P );
+  return getTargetSubDirPath(P);
 }
 
 std::optional<std::string> ToolChain::getRuntimePath() const {

clang/lib/Driver/ToolChains/Flang.cpp

@@ -957,16 +957,13 @@ void Flang::ConstructJob(Compilation &C, const JobAction &JA,
   CmdArgs.push_back("-resource-dir");
   CmdArgs.push_back(D.ResourceDir.c_str());
 
-
-
-  // Default intrinsic module dirs must be added after any user-provided -fintrinsic-modules-path to have lower precedence
-  if  ( auto IntrModPath = TC.getDefaultIntrinsicModuleDir()) {
+  // Default intrinsic module dirs must be added after any user-provided
+  // -fintrinsic-modules-path to have lower precedence
+  if (auto IntrModPath = TC.getDefaultIntrinsicModuleDir()) {
     CmdArgs.push_back("-fintrinsic-modules-path");
-    CmdArgs.push_back( Args.MakeArgString(*IntrModPath));
+    CmdArgs.push_back(Args.MakeArgString(*IntrModPath));
   }
 
-
-
   // Offloading related options
   addOffloadOptions(C, Inputs, JA, Args, CmdArgs);
 

flang/include/flang/Frontend/CompilerInvocation.h

@@ -92,7 +92,8 @@ class CompilerInvocation : public CompilerInvocationBase {
   // intrinsic of iso_fortran_env.
   std::string allCompilerInvocOpts;
 
-  /// Location of the resource directory containing files specific to this instance/version of Flang.
+  /// Location of the resource directory containing files specific to this
+  /// instance/version of Flang.
   std::string resourceDir;
 
   /// Semantic options
@@ -183,8 +184,6 @@ class CompilerInvocation : public CompilerInvocationBase {
   std::string &getResourceDir() { return resourceDir; }
   const std::string &getResourceDir() const { return resourceDir; }
 
-
-
   std::string &getModuleDir() { return moduleDir; }
   const std::string &getModuleDir() const { return moduleDir; }
 

flang/lib/Frontend/CompilerInvocation.cpp

@@ -1500,10 +1500,12 @@ bool CompilerInvocation::createFromArgs(
   }
 
   // User-specified or default resource dir
-  if (const llvm::opt::Arg *a =  args.getLastArg(clang::driver::options::OPT_resource_dir))
-    invoc.resourceDir = a->getValue(); 
-  else 
-    invoc.resourceDir = clang::driver::Driver::GetResourcesPath(llvm::sys::fs::getMainExecutable(argv0, nullptr));
+  if (const llvm::opt::Arg *a =
+          args.getLastArg(clang::driver::options::OPT_resource_dir))
+    invoc.resourceDir = a->getValue();
+  else
+    invoc.resourceDir = clang::driver::Driver::GetResourcesPath(
+        llvm::sys::fs::getMainExecutable(argv0, nullptr));
 
   // -flang-experimental-hlfir
   if (args.hasArg(clang::driver::options::OPT_flang_experimental_hlfir) ||
@@ -1755,7 +1757,6 @@ void CompilerInvocation::setFortranOpts() {
       preprocessorOptions.searchDirectoriesFromIntrModPath.begin(),
       preprocessorOptions.searchDirectoriesFromIntrModPath.end());
 
-
   // Add the ordered list of -fintrinsic-modules-path
   fortranOptions.intrinsicModuleDirectories.insert(
       fortranOptions.intrinsicModuleDirectories.end(),

flang/lib/Optimizer/CodeGen/CodeGen.cpp

@@ -1364,7 +1364,10 @@ getTypeDescriptor(ModOpTy mod, mlir::ConversionPatternRewriter &rewriter,
     return rewriter.create<mlir::LLVM::ZeroOp>(loc, llvmPtrTy);
 
   if (!options.skipExternalRttiDefinition)
-    fir::emitFatalError(loc,  llvm::Twine( "runtime derived type info descriptor of '") + name + "' was not generated and skipExternalRttiDefinition and ignoreMissingTypeDescriptors options are not set");
+    fir::emitFatalError(
+        loc, llvm::Twine("runtime derived type info descriptor of '") + name +
+                 "' was not generated and skipExternalRttiDefinition and "
+                 "ignoreMissingTypeDescriptors options are not set");
 
   // Rtti for a derived type defined in another compilation unit and for which
   // rtti was not defined in lowering because of the skipExternalRttiDefinition

flang/tools/bbc/bbc.cpp

@@ -98,9 +98,10 @@ static llvm::cl::alias
                           llvm::cl::desc("intrinsic module directory"),
                           llvm::cl::aliasopt(intrinsicIncludeDirs));
 
-
-static llvm::cl::alias  intrinsicModulePath("fintrinsic-modules-path", llvm::cl::desc("intrinsic module search paths"), llvm::cl::aliasopt(intrinsicIncludeDirs));
-
+static llvm::cl::alias
+    intrinsicModulePath("fintrinsic-modules-path",
+                        llvm::cl::desc("intrinsic module search paths"),
+                        llvm::cl::aliasopt(intrinsicIncludeDirs));
 
 static llvm::cl::opt<std::string>
     moduleDir("module", llvm::cl::desc("module output directory (default .)"),
@@ -572,12 +573,9 @@ int main(int argc, char **argv) {
   ProgramName programPrefix;
   programPrefix = argv[0] + ": "s;
 
-
-  if (includeDirs.size() == 0) 
+  if (includeDirs.size() == 0)
     includeDirs.push_back(".");
 
-
-
   Fortran::parser::Options options;
   options.predefinitions.emplace_back("__flang__"s, "1"s);
   options.predefinitions.emplace_back("__flang_major__"s,