https://github.com/rafl updated https://github.com/llvm/llvm-project/pull/131932
>From 3bdcfbbb56e80c1724a6e46597d0141c118c68cc Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <florian.ragw...@gmail.com>
Date: Tue, 18 Mar 2025 15:35:42 -0700
Subject: [PATCH 1/5] [clang][scan-build] Treat --use-cc and --use-c++ as shell
commands
So that things like --use-cc="ccache gcc" work.
Fixes #26594.
Also use the slightly simpler shellwords instead of quotewords.
---
clang/tools/scan-build/libexec/ccc-analyzer | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/clang/tools/scan-build/libexec/ccc-analyzer
b/clang/tools/scan-build/libexec/ccc-analyzer
index 74f812aef8fdf..655ded4b102be 100755
--- a/clang/tools/scan-build/libexec/ccc-analyzer
+++ b/clang/tools/scan-build/libexec/ccc-analyzer
@@ -63,6 +63,7 @@ sub SearchInPath {
}
my $Compiler;
+my @CompilerArgs;
my $Clang;
my $DefaultCCompiler;
my $DefaultCXXCompiler;
@@ -89,7 +90,7 @@ if (`uname -s` =~ m/Darwin/) {
}
if ($FindBin::Script =~ /c\+\+-analyzer/) {
- $Compiler = $ENV{'CCC_CXX'};
+ ($Compiler, @CompilerArgs) = shellwords($ENV{'CCC_CXX'});
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) {
$Compiler = $DefaultCXXCompiler; }
$Clang = $ENV{'CLANG_CXX'};
@@ -98,7 +99,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/) {
$IsCXX = 1
}
else {
- $Compiler = $ENV{'CCC_CC'};
+ ($Compiler, @CompilerArgs) = shellwords($ENV{'CCC_CC'});
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) {
$Compiler = $DefaultCCompiler; }
$Clang = $ENV{'CLANG'};
@@ -199,7 +200,7 @@ sub GetCCArgs {
die "could not find clang line\n" if (!defined $line);
# Strip leading and trailing whitespace characters.
$line =~ s/^\s+|\s+$//g;
- my @items = quotewords('\s+', 0, $line);
+ my @items = shellwords($line);
my $cmd = shift @items;
die "cannot find 'clang' in 'clang' command\n" if (!($cmd =~ /clang/ ||
basename($cmd) =~ /llvm/));
# If this is the llvm-driver the internal command will look like "llvm clang
...".
@@ -462,9 +463,9 @@ my $Output;
my %Uniqued;
# Forward arguments to gcc.
-my $Status = system($Compiler,@ARGV);
+my $Status = system($Compiler,@CompilerArgs,@ARGV);
if (defined $ENV{'CCC_ANALYZER_LOG'}) {
- print STDERR "$Compiler @ARGV\n";
+ print STDERR "$Compiler @CompilerArgs @ARGV\n";
}
if ($Status) { exit($Status >> 8); }
>From 6806e42d3c76455be44d6d6bbf8e5041dd331bed Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <florian.ragw...@gmail.com>
Date: Fri, 21 Mar 2025 06:04:45 -0700
Subject: [PATCH 2/5] [clang][scan-build] Minor simplification/refactor of
environment detection
I want to adjust the logic for CCC_CC and CCC_CXX defaults, so not
repeating that logic twice is convenient.
As a nice side-effect, we end up with fewer globals and less code.
Contains no behavioural changes, except for checking for /usr/bin/xcrun
even if we're not on OSX when there's an -isysroot parameter, which
should be fine. We also don't call uname -s twice.
---
clang/tools/scan-build/libexec/ccc-analyzer | 80 +++++++++------------
1 file changed, 35 insertions(+), 45 deletions(-)
diff --git a/clang/tools/scan-build/libexec/ccc-analyzer
b/clang/tools/scan-build/libexec/ccc-analyzer
index 655ded4b102be..9166ae61f12c1 100755
--- a/clang/tools/scan-build/libexec/ccc-analyzer
+++ b/clang/tools/scan-build/libexec/ccc-analyzer
@@ -62,53 +62,42 @@ sub SearchInPath {
return 0;
}
-my $Compiler;
-my @CompilerArgs;
-my $Clang;
-my $DefaultCCompiler;
-my $DefaultCXXCompiler;
-my $IsCXX;
-my $AnalyzerTarget;
-
-# If on OSX, use xcrun to determine the SDK root.
-my $UseXCRUN = 0;
-
-if (`uname -s` =~ m/Darwin/) {
- $DefaultCCompiler = 'clang';
- $DefaultCXXCompiler = 'clang++';
- # Older versions of OSX do not have xcrun to
- # query the SDK location.
- if (-x "/usr/bin/xcrun") {
- $UseXCRUN = 1;
- }
-} elsif (`uname -s` =~ m/(FreeBSD|OpenBSD)/) {
- $DefaultCCompiler = 'cc';
- $DefaultCXXCompiler = 'c++';
-} else {
- $DefaultCCompiler = 'gcc';
- $DefaultCXXCompiler = 'g++';
-}
-
-if ($FindBin::Script =~ /c\+\+-analyzer/) {
- ($Compiler, @CompilerArgs) = shellwords($ENV{'CCC_CXX'});
- if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) {
$Compiler = $DefaultCXXCompiler; }
-
- $Clang = $ENV{'CLANG_CXX'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
-
- $IsCXX = 1
+{
+ my ($DefaultCCompiler, $DefaultCXXCompiler);
+
+ my $os = `uname -s`;
+ if ($os =~ m/Darwin/) {
+ $DefaultCCompiler = 'clang';
+ $DefaultCXXCompiler = 'clang++';
+ } elsif ($os =~ m/(FreeBSD|OpenBSD)/) {
+ $DefaultCCompiler = 'cc';
+ $DefaultCXXCompiler = 'c++';
+ } else {
+ $DefaultCCompiler = 'gcc';
+ $DefaultCXXCompiler = 'g++';
+ }
+
+ sub DetermineCompiler {
+ my ($is_cxx) = @_;
+ my $default = $is_cxx ? $DefaultCXXCompiler : $DefaultCCompiler;
+ my $opt = $ENV{$is_cxx ? 'CCC_CXX' : 'CCC_CC'};
+ return $default unless defined $opt;
+ my ($comp, @args) = shellwords($opt);
+ return !-x $comp && !SearchInPath($comp) ? $default : ($comp, @args);
+ }
}
-else {
- ($Compiler, @CompilerArgs) = shellwords($ENV{'CCC_CC'});
- if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) {
$Compiler = $DefaultCCompiler; }
-
- $Clang = $ENV{'CLANG'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
- $IsCXX = 0
+sub DetermineClang {
+ my ($is_cxx) = @_;
+ my $default = $is_cxx ? 'clang++' : 'clang';
+ my $opt = $ENV{$is_cxx ? 'CLANG_CXX' : 'CLANG'};
+ return !defined $opt || !-x $opt ? $default : $opt;
}
-$AnalyzerTarget = $ENV{'CLANG_ANALYZER_TARGET'};
+my $IsCXX = $FindBin::Script =~ /c\+\+-analyzer/;
+my ($Compiler, @CompilerArgs) = DetermineCompiler($IsCXX);
+my $Clang = DetermineClang($IsCXX);
+my $AnalyzerTarget = $ENV{'CLANG_ANALYZER_TARGET'};
##===----------------------------------------------------------------------===##
# Cleanup.
@@ -699,8 +688,9 @@ if ($ForceAnalyzeDebugCode) {
# If we are on OSX and have an installation where the
# default SDK is inferred by xcrun use xcrun to infer
-# the SDK.
-if (not $HasSDK and $UseXCRUN) {
+# the SDK. Older versions of OSX do not have xcrun to
+# query the SDK location.
+if (not $HasSDK and -x '/usr/bin/xcrun') {
my $sdk = `/usr/bin/xcrun --show-sdk-path -sdk macosx`;
chomp $sdk;
push @CompileOpts, "-isysroot", $sdk;
>From e101c97b60f214e397f0fc4bd4fe7175785d5072 Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <florian.ragw...@gmail.com>
Date: Fri, 21 Mar 2025 06:20:07 -0700
Subject: [PATCH 3/5] [clang][scan-build] Warn about unusable CCC_CC and
CCC_CXX option values
To avoid user confusion when we're ignoring the provided option and use
a default instead.
---
clang/tools/scan-build/libexec/ccc-analyzer | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/clang/tools/scan-build/libexec/ccc-analyzer
b/clang/tools/scan-build/libexec/ccc-analyzer
index 9166ae61f12c1..8c9ba52ed14c4 100755
--- a/clang/tools/scan-build/libexec/ccc-analyzer
+++ b/clang/tools/scan-build/libexec/ccc-analyzer
@@ -83,7 +83,11 @@ sub SearchInPath {
my $opt = $ENV{$is_cxx ? 'CCC_CXX' : 'CCC_CC'};
return $default unless defined $opt;
my ($comp, @args) = shellwords($opt);
- return !-x $comp && !SearchInPath($comp) ? $default : ($comp, @args);
+ if (!-x $comp && !SearchInPath($comp)) {
+ warn "Can't execute '$comp'. Falling back to '$default'.\n";
+ return $default;
+ }
+ return ($comp, @args);
}
}
>From b086d3ecad7e01bd715e584dfe7897d33fda6c07 Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <florian.ragw...@gmail.com>
Date: Fri, 21 Mar 2025 06:23:57 -0700
Subject: [PATCH 4/5] [clang][scan-build] Trust users' compiler choice
If you went out of your way to specify the option, you probably knew
what you wanted and didn't want the default you'd get from not
specifying the option in the first place.
We just let the error from from system() propagate to tell the user that
the option they provided wasn't usable:
$ scan-build-19 --use-cc="enoent gcc" make
scan-build: Using '/usr/lib/llvm-19/bin/clang' for static analysis
...
Can't exec "enoent": No such file or directory ...
---
clang/tools/scan-build/libexec/ccc-analyzer | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/clang/tools/scan-build/libexec/ccc-analyzer
b/clang/tools/scan-build/libexec/ccc-analyzer
index 8c9ba52ed14c4..9dd52b1f27587 100755
--- a/clang/tools/scan-build/libexec/ccc-analyzer
+++ b/clang/tools/scan-build/libexec/ccc-analyzer
@@ -51,17 +51,6 @@ sub silent_system {
# Compiler command setup.
##===----------------------------------------------------------------------===##
-# Search in the PATH if the compiler exists
-sub SearchInPath {
- my $file = shift;
- foreach my $dir (split (':', $ENV{PATH})) {
- if (-x "$dir/$file") {
- return 1;
- }
- }
- return 0;
-}
-
{
my ($DefaultCCompiler, $DefaultCXXCompiler);
@@ -81,13 +70,7 @@ sub SearchInPath {
my ($is_cxx) = @_;
my $default = $is_cxx ? $DefaultCXXCompiler : $DefaultCCompiler;
my $opt = $ENV{$is_cxx ? 'CCC_CXX' : 'CCC_CC'};
- return $default unless defined $opt;
- my ($comp, @args) = shellwords($opt);
- if (!-x $comp && !SearchInPath($comp)) {
- warn "Can't execute '$comp'. Falling back to '$default'.\n";
- return $default;
- }
- return ($comp, @args);
+ return defined $opt ? shellwords($opt) : $default;
}
}
>From 805396fa1ec17a4e8e2ed8fd6c2bd834abfcb963 Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <florian.ragw...@gmail.com>
Date: Fri, 21 Mar 2025 07:26:03 -0700
Subject: [PATCH 5/5] [clang][scan-build] Mirror CCC_{CC,CXX} behaviour for
CLANG{,_CXX}
---
clang/tools/scan-build/libexec/ccc-analyzer | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/tools/scan-build/libexec/ccc-analyzer
b/clang/tools/scan-build/libexec/ccc-analyzer
index 9dd52b1f27587..00c34efa6be0a 100755
--- a/clang/tools/scan-build/libexec/ccc-analyzer
+++ b/clang/tools/scan-build/libexec/ccc-analyzer
@@ -78,7 +78,7 @@ sub DetermineClang {
my ($is_cxx) = @_;
my $default = $is_cxx ? 'clang++' : 'clang';
my $opt = $ENV{$is_cxx ? 'CLANG_CXX' : 'CLANG'};
- return !defined $opt || !-x $opt ? $default : $opt;
+ return defined $opt ? $opt : $default;
}
my $IsCXX = $FindBin::Script =~ /c\+\+-analyzer/;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
