[clang-scan-deps] Don't inspect Args[0] as an option

[mstorsjo]

Since a26ec54, we expand the executable name to an absolute path, if it isn't already one, if found in path.

This broke a couple tests in some environments; when the clang workdir resides in a path under e.g. /opt. Tests that only use a tool name like "clang-cl" would get expanded to the absolute path in the build tree. The loop for finding the last "-o" like option for clang-cl command lines would inspect all arguments, including Args[0] which is the executable name itself. As an /opt path matches Arg.starts_with("/o"), this would get detected as an object file output name in cases where there was no other explicit output argument.

Thus, this fixes those tests in workdirs under e.g. /opt.

[llvmbot]

@llvm/pr-subscribers-clang

Author: Martin Storsjö (mstorsjo)

Changes

Since a26ec54, we expand the executable name to an absolute path, if it isn't already one, if found in path.

This broke a couple tests in some environments; when the clang workdir resides in a path under e.g. /opt. Tests that only use a tool name like "clang-cl" would get expanded to the absolute path in the build tree. The loop for finding the last "-o" like option for clang-cl command lines would inspect all arguments, including Args[0] which is the executable name itself. As an /opt path matches Arg.starts_with("/o"), this would get detected as an object file output name in cases where there was no other explicit output argument.

Thus, this fixes those tests in workdirs under e.g. /opt.

---

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

1 Files Affected:

• (modified) clang/tools/clang-scan-deps/ClangScanDeps.cpp (+3-1)

diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp b/clang/tools/clang-scan-deps/ClangScanDeps.cpp
index ac68e3605a10cb..5d975f8aa82ee5 100644
--- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp
+++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp
@@ -839,9 +839,11 @@ int clang_scan_deps_main(int argc, char **argv, const llvm::ToolContext &) {
           auto R = std::make_reverse_iterator(FlagsEnd);
           for (auto I = R, E = Args.rend(); I != E; ++I) {
             StringRef Arg = *I;
+            if ((I + 1) == E) // Don't inspect Args[0] as an option.
+              break;
             if (ClangCLMode) {
               // Ignore arguments that are preceded by "-Xclang".
-              if ((I + 1) != E && I[1] == "-Xclang")
+              if (I[1] == "-Xclang")
                 continue;
               if (LastO.empty()) {
                 // With clang-cl, the output obj file can be specified with

[rorth]

I can confirm that the patch fixes the error I'm seeing on the Solaris buildbots. Thanks.

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.