[analyzer] Preserve the order checkers were enabled/disabled.
In addition to r251524: preserve the order the checkers were enabled/disabled to be deterministic.
Additionally return the number of arguments read by 'ProcessArgs' - for debug purpose.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk/tools/scan-build@251552 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/scan-build b/scan-build
index 50193ed..24796c7 100755
--- a/scan-build
+++ b/scan-build
@@ -1447,9 +1447,12 @@
sub ProcessArgs {
my $Args = shift;
+ my $NumArgs = 0;
while (@$Args) {
+ $NumArgs++;
+
# Scan for options we recognize.
my $arg = $Args->[0];
@@ -1631,7 +1634,8 @@
if ($arg eq "-enable-checker") {
shift @$Args;
my $Checker = shift @$Args;
- $Options{EnableCheckers}{$Checker} = 1;
+ # Store $NumArgs to preserve the order the checkers were enabled.
+ $Options{EnableCheckers}{$Checker} = $NumArgs;
delete $Options{DisableCheckers}{$Checker};
next;
}
@@ -1639,7 +1643,8 @@
if ($arg eq "-disable-checker") {
shift @$Args;
my $Checker = shift @$Args;
- $Options{DisableCheckers}{$Checker} = 1;
+ # Store $NumArgs to preserve the order the checkers were disabled.
+ $Options{DisableCheckers}{$Checker} = $NumArgs;
delete $Options{EnableCheckers}{$Checker};
next;
}
@@ -1676,8 +1681,10 @@
DieDiag("unrecognized option '$arg'\n") if ($arg =~ /^-/);
+ $NumArgs--;
last;
}
+ return $NumArgs;
}
if (!@ARGV) {
@@ -1751,8 +1758,16 @@
SetHtmlEnv(\@ARGV, $Options{OutputDir});
my @AnalysesToRun;
-foreach (keys %{$Options{EnableCheckers}}) { push @AnalysesToRun, "-analyzer-checker", $_; }
-foreach (keys %{$Options{DisableCheckers}}) { push @AnalysesToRun, "-analyzer-disable-checker", $_; }
+foreach (sort { $Options{EnableCheckers}{$a} <=> $Options{EnableCheckers}{$b} }
+ keys %{$Options{EnableCheckers}}) {
+ # Push checkers in order they were enabled.
+ push @AnalysesToRun, "-analyzer-checker", $_;
+}
+foreach (sort { $Options{DisableCheckers}{$a} <=> $Options{DisableCheckers}{$b} }
+ keys %{$Options{DisableCheckers}}) {
+ # Push checkers in order they were disabled.
+ push @AnalysesToRun, "-analyzer-disable-checker", $_;
+}
if ($Options{AnalyzeHeaders}) { push @AnalysesToRun, "-analyzer-opt-analyze-headers"; }
if ($Options{AnalyzerStats}) { push @AnalysesToRun, '-analyzer-checker=debug.Stats'; }
if ($Options{MaxLoop} > 0) { push @AnalysesToRun, "-analyzer-max-loop $Options{MaxLoop}"; }
