This revision was automatically updated to reflect the committed changes. Closed by commit rL371002: [analyzer] scan-build: handle --sysroot=/path in addition to --sysroot /path. (authored by dergachev, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D66569?vs=216524&id=218817#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D66569/new/ https://reviews.llvm.org/D66569 Files: cfe/trunk/tools/scan-build/libexec/ccc-analyzer Index: cfe/trunk/tools/scan-build/libexec/ccc-analyzer =================================================================== --- cfe/trunk/tools/scan-build/libexec/ccc-analyzer +++ cfe/trunk/tools/scan-build/libexec/ccc-analyzer @@ -498,7 +498,8 @@ # Process the arguments. foreach (my $i = 0; $i < scalar(@ARGV); ++$i) { my $Arg = $ARGV[$i]; - my ($ArgKey) = split /=/,$Arg,2; + my @ArgParts = split /=/,$Arg,2; + my $ArgKey = @ArgParts[0]; # Be friendly to "" in the argument list. if (!defined($ArgKey)) { @@ -566,10 +567,12 @@ push @CompileOpts,$Arg; push @LinkOpts,$Arg; - while ($Cnt > 0) { - ++$i; --$Cnt; - push @CompileOpts, $ARGV[$i]; - push @LinkOpts, $ARGV[$i]; + if (scalar @ArgParts == 1) { + while ($Cnt > 0) { + ++$i; --$Cnt; + push @CompileOpts, $ARGV[$i]; + push @LinkOpts, $ARGV[$i]; + } } next; }
Index: cfe/trunk/tools/scan-build/libexec/ccc-analyzer =================================================================== --- cfe/trunk/tools/scan-build/libexec/ccc-analyzer +++ cfe/trunk/tools/scan-build/libexec/ccc-analyzer @@ -498,7 +498,8 @@ # Process the arguments. foreach (my $i = 0; $i < scalar(@ARGV); ++$i) { my $Arg = $ARGV[$i]; - my ($ArgKey) = split /=/,$Arg,2; + my @ArgParts = split /=/,$Arg,2; + my $ArgKey = @ArgParts[0]; # Be friendly to "" in the argument list. if (!defined($ArgKey)) { @@ -566,10 +567,12 @@ push @CompileOpts,$Arg; push @LinkOpts,$Arg; - while ($Cnt > 0) { - ++$i; --$Cnt; - push @CompileOpts, $ARGV[$i]; - push @LinkOpts, $ARGV[$i]; + if (scalar @ArgParts == 1) { + while ($Cnt > 0) { + ++$i; --$Cnt; + push @CompileOpts, $ARGV[$i]; + push @LinkOpts, $ARGV[$i]; + } } next; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits