@ -16,22 +16,12 @@ module F = Format
module CLOpt = CommandLineOption module CLOpt = CommandLineOption
module L = Die module L = Die
type analyzer = CaptureOnly | CompileOnly | Checkers | Crashcontext | Linters type analyzer = Checkers | Crashcontext | Linters [ @@ deriving compare ]
[ @@ deriving compare ]
let equal_analyzer = [ % compare . equal : analyzer ] let equal_analyzer = [ % compare . equal : analyzer ]
let string_to_analyzer = let string_to_analyzer =
[ ( " checkers " , Checkers )
[ ( " checkers " , Checkers ) ; ( " crashcontext " , Crashcontext ) ; ( " linters " , Linters ) ]
; ( " infer " , Checkers )
; ( " capture " , CaptureOnly )
; ( " compile " , CompileOnly )
; ( " crashcontext " , Crashcontext )
; ( " linters " , Linters ) ]
let string_of_analyzer a =
List . find_exn ~ f : ( fun ( _ , a' ) -> equal_analyzer a a' ) string_to_analyzer | > fst
let clang_frontend_action_symbols = let clang_frontend_action_symbols =
@ -551,62 +541,32 @@ and allow_leak =
CLOpt . mk_bool ~ deprecated : [ " leak " ] ~ long : " allow-leak " " Forget leaked memory during abstraction "
CLOpt . mk_bool ~ deprecated : [ " leak " ] ~ long : " allow-leak " " Forget leaked memory during abstraction "
and ( analysis_blacklist_files_containing_options and ( analysis_blacklist_files_containing
, analysis_path_regex_blacklist_options
, analysis_path_regex_blacklist
, analysis_path_regex_whitelist_options
, analysis_path_regex_whitelist
, analysis_suppress_errors_options ) =
, analysis_suppress_errors ) =
let mk_filtering_options ~ suffix ? ( deprecated_suffix = [] ) ~ help ~ meta =
let mk_filtering_option ~ suffix ~ help ~ meta =
(* reuse the same config var for all the forms of the analyzer name ( eg infer and biabduction
let deprecated =
must map to the same filtering config ) * )
List . map [ " checkers " ; " infer " ] ~ f : ( fun name -> Printf . sprintf " %s-%s " name suffix )
let config_vars = ref [] in
let mk_option analyzer analyzer_name =
let long = Printf . sprintf " %s-%s " analyzer_name suffix in
let deprecated = List . map ~ f : ( Printf . sprintf " %s_%s " analyzer_name ) deprecated_suffix in
let source_of_truth =
List . find_map ! config_vars ~ f : ( fun ( a , v ) ->
if equal_analyzer a analyzer then Some v else None )
in
(* if the analyzer already has a variable associated to it, make the new name update the same
variable * )
let mirror opt =
Option . iter source_of_truth ~ f : ( fun var -> var := opt :: ! var ) ;
opt
in
(* empty doc to hide the options from --help since there are many redundant ones *)
let var = CLOpt . mk_string_list ~ deprecated ~ long ~ meta ~ f : mirror " " in
match source_of_truth with
| Some var ->
(* if the analyzer already has a variable associated to it, use it *)
var
| None ->
(* record the variable associated to the analyzer if this is the first time we see this
analyzer * )
config_vars := ( analyzer , var ) :: ! config_vars ;
var
in
in
ignore
let long = Printf . sprintf " report-%s " suffix in
( let long = " <analyzer>- " ^ suffix in
CLOpt . mk_string_list ~ deprecated ~ long ~ meta
CLOpt . mk_string_list ~ long ~ meta
~ in_help : InferCommand . [ ( Report , manual_generic ) ; ( Run , manual_generic ) ]
~ f : ( fun _ -> raise ( Arg . Bad " invalid option " ) )
help
~ in_help : InferCommand . [ ( Report , manual_generic ) ; ( Run , manual_generic ) ]
help ) ;
List . map ~ f : ( fun ( name , analyzer ) -> ( analyzer , mk_option analyzer name ) ) string_to_analyzer
in
in
( mk_filtering_options ~ suffix : " blacklist-files-containing "
( mk_filtering_option ~ suffix : " blacklist-files-containing "
~ deprecated_suffix : [ " blacklist_files_containing " ]
~ help :
~ help :
" blacklist files containing the specified string for the given analyzer (see \
" blacklist files containing the specified string for the given analyzer (see \
$ ( b , - - analyzer ) for valid values ) "
$ ( b , - - analyzer ) for valid values ) "
~ meta : " string "
~ meta : " string "
, mk_filtering_option s ~ suffix : " blacklist-path-regex " ~ deprecated_suffix : [ " blacklist " ]
, mk_filtering_option ~ suffix : " blacklist-path-regex "
~ help :
~ help :
" blacklist the analysis of files whose relative path matches the specified OCaml-style \
" blacklist the analysis of files whose relative path matches the specified OCaml-style \
regex ( to whitelist : $ ( b , - - < analyzer > - whitelist - path - regex ) ) "
regex ( to whitelist : $ ( b , - - < analyzer > - whitelist - path - regex ) ) "
~ meta : " path_regex "
~ meta : " path_regex "
, mk_filtering_options ~ suffix : " whitelist-path-regex " ~ deprecated_suffix : [ " whitelist " ] ~ help : " "
, mk_filtering_option ~ suffix : " whitelist-path-regex " ~ help : " " ~ meta : " path_regex "
~ meta : " path_regex "
, mk_filtering_option ~ suffix : " suppress-errors " ~ help : " do not report a type of errors "
, mk_filtering_options ~ suffix : " suppress-errors " ~ deprecated_suffix : [ " suppress_errors " ]
~ meta : " error_name " )
~ help : " do not report a type of errors " ~ meta : " error_name " )
and analysis_stops = and analysis_stops =
@ -615,38 +575,10 @@ and analysis_stops =
and analyzer = and analyzer =
let () =
CLOpt . mk_symbol ~ deprecated : [ " analyzer " ; " -analyzer " ; " a " ] ~ long : " " ~ default : Checkers
match Checkers with
~ eq : equal_analyzer ~ symbols : string_to_analyzer
(* NOTE: if compilation fails here, it means you have added a new analyzer without updating the
" DEPRECATED: To enable and disable individual analyses, use the various checkers options. For \
documentation of this option * )
instance , to enable only the biabduction analysis , run with $ ( b , - - biabduction - only ) . "
| CaptureOnly | CompileOnly | Checkers | Crashcontext | Linters ->
()
in
CLOpt . mk_symbol_opt ~ deprecated : [ " analyzer " ] ~ long : " analyzer " ~ short : 'a'
~ in_help : InferCommand . [ ( Analyze , manual_generic ) ; ( Run , manual_generic ) ]
{ | Specify which analyzer to run ( only one at a time is supported ) :
- $ ( b , biabduction ) : run the bi - abduction based checker only , in particular to check for memory errors
- $ ( b , checkers ) : run the default checkers , including the bi - abduction based checker for memory errors ( default )
- $ ( b , infer ) : alias for $ ( b , biabduction )
- $ ( b , linters ) : run linters based on the ast only ( clang only , activated by default )
- $ ( b , capture ) : similar to specifying the $ ( b , capture ) subcommand ( DEPRECATED )
- $ ( b , compile ) : similar to specifying the $ ( b , compile ) subcommand ( DEPRECATED )
- $ ( b , crashcontext ) : experimental ( see $ ( b , - - crashcontext ) ) | }
~ f : ( function
| ( CaptureOnly | CompileOnly ) as x ->
let analyzer_str =
List . find_map_exn string_to_analyzer ~ f : ( fun ( s , y ) ->
if equal_analyzer x y then Some s else None )
in
CLOpt . warnf
" WARNING: The analyzer '%s' is deprecated, use the '%s' subcommand instead:@ \n \
@ \ n \
infer % s .. . "
analyzer_str analyzer_str analyzer_str ;
x
| _ as x ->
x )
~ symbols : string_to_analyzer
and ( annotation_reachability and ( annotation_reachability
@ -2320,11 +2252,6 @@ let post_parsing_initialization command_opt =
print_endline version_string ; prerr_endline version_string
print_endline version_string ; prerr_endline version_string
| ` Javac when ! buck ->
| ` Javac when ! buck ->
(* print buck key *)
(* print buck key *)
let analyzer_name =
List . Assoc . find_exn ~ equal : equal_analyzer
( List . map ~ f : ( fun ( n , a ) -> ( a , n ) ) string_to_analyzer )
( match ! analyzer with Some a -> a | None -> Checkers )
in
let infer_version =
let infer_version =
match inferconfig_file with
match inferconfig_file with
| Some inferconfig ->
| Some inferconfig ->
@ -2333,8 +2260,8 @@ let post_parsing_initialization command_opt =
| None ->
| None ->
Version . commit
Version . commit
in
in
F . printf " %s/%s@." analyzer_name infer_version ;
F . printf " infer/%s@." infer_version ;
F . eprintf " %s/%s@." analyzer_name infer_version
F . eprintf " infer/%s@." infer_version
| ` Full ->
| ` Full ->
print_endline version_string
print_endline version_string
| ` Javac ->
| ` Javac ->
@ -2421,23 +2348,15 @@ let post_parsing_initialization command_opt =
(* set analyzer mode to linters in linters developer mode *)
(* set analyzer mode to linters in linters developer mode *)
if ! linters_developer_mode then linters := true ;
if ! linters_developer_mode then linters := true ;
if ! default_linters then linters_def_file := linters_def_default_file :: ! linters_def_file ;
if ! default_linters then linters_def_file := linters_def_default_file :: ! linters_def_file ;
( if Option . is_none ! analyzer then
match ( command_opt : InferCommand . t option ) with
| Some Compile ->
analyzer := Some CompileOnly
| Some Capture ->
analyzer := Some CaptureOnly
| _ ->
() ) ;
( match ! analyzer with
( match ! analyzer with
| Some Crashcontext ->
| Crashcontext ->
disable_all_checkers () ;
disable_all_checkers () ;
crashcontext := true
crashcontext := true
| Some Linters ->
| Linters ->
disable_all_checkers () ;
disable_all_checkers () ;
capture := false ;
capture := false ;
linters := true
linters := true
| Some ( CaptureOnly | Checkers | CompileOnly ) | None ->
| ->
() ) ;
() ) ;
Option . value ~ default : InferCommand . Run command_opt
Option . value ~ default : InferCommand . Run command_opt
@ -2495,21 +2414,13 @@ and abs_val = !abs_val
and allow_leak = ! allow_leak and allow_leak = ! allow_leak
and analysis_path_regex_whitelist_options = and analysis_path_regex_whitelist = ! analysis_path_regex_whitelist
List . map ~ f : ( fun ( a , b ) -> ( a , ! b ) ) analysis_path_regex_whitelist_options
and analysis_path_regex_blacklist_options = and analysis_path_regex_blacklist = ! analysis_path_regex_blacklist
List . map ~ f : ( fun ( a , b ) -> ( a , ! b ) ) analysis_path_regex_blacklist_options
and analysis_blacklist_files_containing = ! analysis_blacklist_files_containing
and analysis_blacklist_files_containing_options = and analysis_suppress_errors = ! analysis_suppress_errors
List . map ~ f : ( fun ( a , b ) -> ( a , ! b ) ) analysis_blacklist_files_containing_options
and analysis_suppress_errors_options =
List . map ~ f : ( fun ( a , b ) -> ( a , ! b ) ) analysis_suppress_errors_options
and analysis_stops = ! analysis_stops and analysis_stops = ! analysis_stops
@ -3012,26 +2923,8 @@ and xcpretty = !xcpretty
(* * Configuration values derived from command-line options *) (* * Configuration values derived from command-line options *)
let analysis_path_regex_whitelist analyzer =
List . Assoc . find_exn ~ equal : equal_analyzer analysis_path_regex_whitelist_options analyzer
and analysis_path_regex_blacklist analyzer =
List . Assoc . find_exn ~ equal : equal_analyzer analysis_path_regex_blacklist_options analyzer
and analysis_blacklist_files_containing analyzer =
List . Assoc . find_exn ~ equal : equal_analyzer analysis_blacklist_files_containing_options analyzer
and analysis_suppress_errors analyzer =
List . Assoc . find_exn ~ equal : equal_analyzer analysis_suppress_errors_options analyzer
let captured_dir = results_dir ^/ captured_dir_name let captured_dir = results_dir ^/ captured_dir_name
let analyzer = match ! analyzer with Some a -> a | None -> Checkers
let clang_frontend_action_string = let clang_frontend_action_string =
String . concat ~ sep : " and "
String . concat ~ sep : " and "
( ( if capture then [ " translating " ] else [] ) @ if linters then [ " linting " ] else [] )
( ( if capture then [ " translating " ] else [] ) @ if linters then [ " linting " ] else [] )
Jules Villard
6 years ago
committed by
Facebook Github Bot