https://github.com/mstorsjo updated
https://github.com/llvm/llvm-project/pull/109050
From 73dbd692945899708e2c127ba9972c20e5fcd30f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <mar...@martin.st>
Date: Wed, 18 Sep 2024 00:03:00 +0300
Subject: [PATCH] [clang-scan-deps] Don't inspect Args[0] as an option
Since a26ec542371652e1d774696e90016fd5b0b1c191, 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.
---
clang/tools/clang-scan-deps/ClangScanDeps.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp
b/clang/tools/clang-scan-deps/ClangScanDeps.cpp
index ac68e3605a10cb..e9e0534e8d6cff 100644
--- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp
+++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp
@@ -837,7 +837,11 @@ int clang_scan_deps_main(int argc, char **argv, const
llvm::ToolContext &) {
// Reverse scan, starting at the end or at the element before "--".
auto R = std::make_reverse_iterator(FlagsEnd);
- for (auto I = R, E = Args.rend(); I != E; ++I) {
+ auto E = Args.rend();
+ // Don't include Args[0] in the iteration; that's the executable,
not an option.
+ if (E != R)
+ E--;
+ for (auto I = R; I != E; ++I) {
StringRef Arg = *I;
if (ClangCLMode) {
// Ignore arguments that are preceded by "-Xclang".
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
