Skip to content

Conversation

@lamb-j
Copy link
Contributor

@lamb-j lamb-j commented Jan 28, 2025

No description provided.

@llvmbot llvmbot added clang Clang issues not falling into any other category clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' labels Jan 28, 2025
@llvmbot
Copy link
Member

llvmbot commented Jan 28, 2025

@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clang-driver

Author: Jacob Lambert (lamb-j)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/124809.diff

1 Files Affected:

  • (modified) clang/lib/Driver/Driver.cpp (+6-7)
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 87855fdb799710..e484334fd02d79 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -18,8 +18,8 @@
 #include "ToolChains/CrossWindows.h"
 #include "ToolChains/Cuda.h"
 #include "ToolChains/Darwin.h"
-#include "ToolChains/DragonFly.h"
 #include "ToolChains/FreeBSD.h"
+#include "ToolChains/DragonFly.h"
 #include "ToolChains/Fuchsia.h"
 #include "ToolChains/Gnu.h"
 #include "ToolChains/HIPAMD.h"
@@ -107,7 +107,7 @@
 
 using namespace clang::driver;
 using namespace clang;
-using namespace llvm::opt;
+        using namespace llvm::opt;
 
 static std::optional<llvm::Triple> getOffloadTargetTriple(const Driver &D,
                                                           const ArgList &Args) {
@@ -314,14 +314,14 @@ InputArgList Driver::ParseArgStrings(ArrayRef<const char *> ArgStrings,
   ContainsError = false;
 
   llvm::opt::Visibility VisibilityMask = getOptionVisibilityMask(UseDriverMode);
-  unsigned MissingArgIndex, MissingArgCount;
-  InputArgList Args = getOpts().ParseArgs(ArgStrings, MissingArgIndex,
+  unsigned missing_arg_index, MissingArgCount;
+  InputArgList Args = getOpts().ParseArgs(ArgStrings, missing_arg_index,
                                           MissingArgCount, VisibilityMask);
 
   // Check for missing argument error.
   if (MissingArgCount) {
     Diag(diag::err_drv_missing_argument)
-        << Args.getArgString(MissingArgIndex) << MissingArgCount;
+        << Args.getArgString(missing_arg_index) << MissingArgCount;
     ContainsError |=
         Diags.getDiagnosticLevel(diag::err_drv_missing_argument,
                                  SourceLocation()) > DiagnosticsEngine::Warning;
@@ -371,8 +371,7 @@ InputArgList Driver::ParseArgStrings(ArrayRef<const char *> ArgStrings,
                      DiagnosticsEngine::Warning;
   }
 
-  for (const Arg *A : Args.filtered(options::OPT_o)) {
-    if (ArgStrings[A->getIndex()] == A->getSpelling())
+  for (const Arg *A : Args.filtered(options::OPT_o)) { if (ArgStrings[A->getIndex()] == A->getSpelling())
       continue;
 
     // Warn on joined arguments that are similar to a long argument.

@github-actions
Copy link

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:
git-clang-format --diff 0b80491cd5e7dcb6d5432727d0a2c746a9a9438e 4ed0192fca412dcb801ea75ad0d086153fa5b531 --extensions cpp -- clang/lib/Driver/Driver.cpp
View the diff from clang-format here.
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index e484334fd0..777d2d9992 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -18,8 +18,8 @@
 #include "ToolChains/CrossWindows.h"
 #include "ToolChains/Cuda.h"
 #include "ToolChains/Darwin.h"
-#include "ToolChains/FreeBSD.h"
 #include "ToolChains/DragonFly.h"
+#include "ToolChains/FreeBSD.h"
 #include "ToolChains/Fuchsia.h"
 #include "ToolChains/Gnu.h"
 #include "ToolChains/HIPAMD.h"
@@ -107,7 +107,7 @@
 
 using namespace clang::driver;
 using namespace clang;
-        using namespace llvm::opt;
+using namespace llvm::opt;
 
 static std::optional<llvm::Triple> getOffloadTargetTriple(const Driver &D,
                                                           const ArgList &Args) {
@@ -371,7 +371,8 @@ InputArgList Driver::ParseArgStrings(ArrayRef<const char *> ArgStrings,
                      DiagnosticsEngine::Warning;
   }
 
-  for (const Arg *A : Args.filtered(options::OPT_o)) { if (ArgStrings[A->getIndex()] == A->getSpelling())
+  for (const Arg *A : Args.filtered(options::OPT_o)) {
+    if (ArgStrings[A->getIndex()] == A->getSpelling())
       continue;
 
     // Warn on joined arguments that are similar to a long argument.

@lamb-j lamb-j closed this May 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' clang Clang issues not falling into any other category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants