Skip to content

Commit a4f11ae

Browse files
authored
Merge pull request #1517 from haoNoQ/static-analyzer-cherrypicks-14
[analyzer] scan-build: Fix silencing multiple core checkers.
2 parents 6d75449 + 665d572 commit a4f11ae

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

clang/tools/scan-build/bin/scan-build

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,11 +1972,13 @@ my $CCC_ANALYZER_ANALYSIS = join ' ', @AnalysesToRun;
19721972
my $CCC_ANALYZER_PLUGINS = join ' ', map { "-load ".$_ } @{$Options{PluginsToLoad}};
19731973
my $CCC_ANALYZER_CONFIG = join ' ', map { "-analyzer-config ".$_ } @{$Options{ConfigOptions}};
19741974

1975-
foreach (sort { $Options{SilenceCheckers}{$a} <=> $Options{SilenceCheckers}{$b} }
1976-
keys %{$Options{SilenceCheckers}}) {
1977-
# Add checkers in order they were silenced.
1975+
if (%{$Options{SilenceCheckers}}) {
19781976
$CCC_ANALYZER_CONFIG =
1979-
$CCC_ANALYZER_CONFIG." -analyzer-config silence-checkers=".$_;
1977+
$CCC_ANALYZER_CONFIG." -analyzer-config silence-checkers="
1978+
.join(';', sort {
1979+
$Options{SilenceCheckers}{$a} <=>
1980+
$Options{SilenceCheckers}{$b}
1981+
} keys %{$Options{SilenceCheckers}});
19801982
}
19811983

19821984
my %EnvVars = (

0 commit comments

Comments
 (0)