[infer][checkers] remove the threadsafey as analyzer option and rely on the --threadsafety flag only

Summary:
First step to be able to enable and disable the checkers to run in the following form:
  > infer -a checkers --checker1 --checker2 --checker3 -- ...
and have a predefined list of checkers that are run by default with:
  > infer -a checkers -- ...

Reviewed By: sblackshear

Differential Revision: D5007377

fbshipit-source-id: d7339ef

infer/src/backend/InferPrint.re

@@ -279,8 +279,7 @@ let should_report (issue_kind: Exceptions.err_kind) issue_type error_desc eclass
       | Crashcontext
       | Infer
       | Linters
-      | Quandary
-      | Threadsafety => false
+      | Quandary => false
       };
     if analyzer_is_whitelisted {
       true

infer/src/backend/infer.ml

@@ -375,7 +375,7 @@ let analyze driver_mode =
         false, false
     | _, (Capture | Compile) ->
         false, false
-    | _, (Infer | Eradicate | Checkers | Tracing | Crashcontext | Quandary | Siof | Threadsafety
+    | _, (Infer | Eradicate | Checkers | Tracing | Crashcontext | Quandary | Siof
          | Bufferoverrun) ->
         true, true
     | _, Linters ->

infer/src/base/Config.ml

@@ -37,7 +37,7 @@ let frontend_parse_modes = CLOpt.(Infer [Clang])
 
 type analyzer =
   | Capture | Compile | Infer | Eradicate | Checkers | Tracing | Crashcontext | Linters | Quandary
-  | Siof | Threadsafety | Bufferoverrun
+  | Siof | Bufferoverrun
 [@@deriving compare]
 
 let equal_analyzer = [%compare.equal : analyzer]
@@ -46,8 +46,7 @@ let string_to_analyzer =
   [("capture", Capture); ("compile", Compile);
    ("infer", Infer); ("eradicate", Eradicate); ("checkers", Checkers);
    ("tracing", Tracing); ("crashcontext", Crashcontext); ("linters", Linters);
-   ("quandary", Quandary); ("siof", Siof); ("threadsafety", Threadsafety);
-   ("bufferoverrun", Bufferoverrun)]
+   ("quandary", Quandary); ("siof", Siof); ("bufferoverrun", Bufferoverrun)]
 
 let string_of_analyzer a =
   List.find_exn ~f:(fun (_, a') -> equal_analyzer a a') string_to_analyzer |> fst
@@ -483,11 +482,11 @@ and analyzer =
     (* NOTE: if compilation fails here, it means you have added a new analyzer without updating the
        documentation of this option *)
     | Capture | Compile | Infer | Eradicate | Checkers | Tracing | Crashcontext | Linters
-    | Quandary | Siof | Threadsafety | Bufferoverrun -> () in
+    | Quandary | Siof | Bufferoverrun -> () in
   CLOpt.mk_symbol_opt ~deprecated:["analyzer"] ~long:"analyzer" ~short:'a'
     ~parse_mode:CLOpt.(Infer [Driver])
     "Specify which analyzer to run (only one at a time is supported):\n\
-     - infer, eradicate, checkers, quandary, threadsafety, bufferoverrun: run the specified analysis\n\
+     - infer, eradicate, checkers, quandary, bufferoverrun: run the specified analysis\n\
      - capture: run capture phase only (no analysis)\n\
      - compile: run compilation command without interfering (not supported by all frontends)\n\
      - crashcontext, tracing: experimental (see --crashcontext and --tracing)\n\
@@ -521,6 +520,10 @@ and ast_file =
   CLOpt.mk_path_opt ~deprecated:["ast"] ~long:"ast-file"
     ~meta:"file" "AST file for the translation"
 
+and biabduction =
+  CLOpt.mk_bool ~long:"biabduction" ~parse_mode:CLOpt.(Infer [Checkers])
+    "Activate the separation logic based bi-abduction analysis using the checkers framework"
+
 and blacklist =
   CLOpt.mk_string_opt ~deprecated:["-blacklist-regex";"-blacklist"] ~long:"buck-blacklist"
     ~parse_mode:CLOpt.(Infer [Driver])
@@ -589,12 +592,8 @@ and changed_files_index =
     "Specify the file containing the list of source files from which reactive analysis should \
      start. Source files should be specified relative to project root or be absolute"
 
-let biabduction =
-  CLOpt.mk_bool ~long:"biabduction"
-    "Activate the separation logic based bi-abduction analysis using the checkers framework"
-
 and bufferoverrun, checkers, checkers_repeated_calls,
-    crashcontext, eradicate, quandary, siof, threadsafety =
+    eradicate, quandary, siof =
   let checkers =
     CLOpt.mk_bool ~deprecated:["checkers"] ~long:"checkers"
       "Activate the checkers instead of the full analysis"
@@ -609,11 +608,6 @@ and bufferoverrun, checkers, checkers_repeated_calls,
       "Check for repeated calls"
       [checkers] []
   in
-  let crashcontext =
-    CLOpt.mk_bool_group ~deprecated:["crashcontext"] ~long:"crashcontext"
-      "Activate the crashcontext checker for Java stack trace context reconstruction"
-      [checkers] []
-  in
   let eradicate =
     CLOpt.mk_bool_group ~deprecated:["eradicate"] ~long:"eradicate"
       "Activate the eradicate checker for Java annotations"
@@ -629,13 +623,8 @@ and bufferoverrun, checkers, checkers_repeated_calls,
       "Activate the Static Initialization Order Fiasco analysis"
       [checkers] []
   in
-  let threadsafety =
-    CLOpt.mk_bool_group ~deprecated:["threadsafety"] ~long:"threadsafety"
-      "Activate the thread safety analysis"
-      [checkers] []
-  in
   (bufferoverrun, checkers, checkers_repeated_calls,
-   crashcontext, eradicate, quandary, siof, threadsafety)
+   eradicate, quandary, siof)
 
 and clang_biniou_file =
   CLOpt.mk_path_opt ~long:"clang-biniou-file" ~parse_mode:CLOpt.(Infer [Clang]) ~meta:"file"
@@ -704,6 +693,10 @@ and copy_propagation =
   CLOpt.mk_bool ~deprecated:["copy-propagation"] ~long:"copy-propagation"
     "Perform copy-propagation on the IR"
 
+and crashcontext =
+  CLOpt.mk_bool ~long:"crashcontext" ~parse_mode:CLOpt.(Infer [Checkers])
+    "Activate the crashcontext checker for Java stack trace context reconstruction"
+
 and cxx =
   CLOpt.mk_bool ~deprecated:["cxx-experimental"] ~long:"cxx"
     ~default:true
@@ -1360,6 +1353,10 @@ and threadsafe_aliases =
     ~parse_mode:CLOpt.(Infer [Checkers])
     "Specify custom annotations that should be considered aliases of @ThreadSafe"
 
+and threadsafety =
+  CLOpt.mk_bool ~long:"threadsafety" ~parse_mode:CLOpt.(Infer [Checkers])
+    "Activate the thread safety analysis"
+
 and trace_join =
   CLOpt.mk_bool ~deprecated:["trace_join"] ~long:"trace-join"
     "Detailed tracing information during prop join operations"
@@ -1559,7 +1556,6 @@ let post_parsing_initialization () =
   | Some Crashcontext -> checkers := true; crashcontext := true
   | Some Eradicate -> checkers := true; eradicate := true
   | Some Quandary -> checkers := true; quandary := true
-  | Some Threadsafety -> checkers := true; threadsafety := true
   | Some Bufferoverrun -> checkers := true; bufferoverrun := true
   | Some Siof -> checkers := true; siof := true
   | Some Tracing -> tracing := true
@@ -1800,9 +1796,6 @@ and analysis_blacklist_files_containing analyzer =
 and analysis_suppress_errors analyzer =
   List.Assoc.find_exn ~equal:equal_analyzer analysis_suppress_errors_options analyzer
 
-let checkers_enabled =
-  not (eradicate || crashcontext || quandary || threadsafety || checkers_repeated_calls)
-
 let captured_dir = results_dir ^/ captured_dir_name
 
 let clang_frontend_do_capture, clang_frontend_do_lint =

infer/src/base/Config.mli

@@ -20,7 +20,7 @@ val exe_name : exe -> string
 (** Various kind of analyzers *)
 type analyzer =
   | Capture | Compile | Infer | Eradicate | Checkers | Tracing | Crashcontext | Linters | Quandary
-  | Siof | Threadsafety | Bufferoverrun
+  | Siof | Bufferoverrun
 [@@deriving compare]
 
 val equal_analyzer : analyzer -> analyzer -> bool
@@ -193,7 +193,6 @@ val calls_csv : string option
 val captured_dir : string
 
 val checkers : bool
-val checkers_enabled : bool
 val checkers_repeated_calls : bool
 val clang_biniou_file : string option
 val clang_frontend_action_string : string

infer/src/checkers/registerCheckers.ml

@@ -14,22 +14,28 @@ open! IStd
 module L = Logging
 module F = Format
 
+let enabled_by_default =
+  (* True when no checker is explicitely enabled from the command line *)
+  let open Config in
+  not (bufferoverrun || checkers_repeated_calls || crashcontext
+       || eradicate || quandary || siof || threadsafety)
+
 (** Flags to activate checkers. *)
 let active_procedure_checkers () =
 
   let java_checkers =
     let l =
       [
-        FragmentRetainsViewChecker.callback_fragment_retains_view, Config.checkers_enabled;
+        FragmentRetainsViewChecker.callback_fragment_retains_view, enabled_by_default;
         Eradicate.callback_eradicate, Config.eradicate;
         BoundedCallTree.checker, Config.crashcontext;
         JavaTaintAnalysis.checker, Config.quandary;
-        ImmutableChecker.callback_check_immutable_cast, Config.checkers_enabled;
+        ImmutableChecker.callback_check_immutable_cast, enabled_by_default;
         RepeatedCallsChecker.callback_check_repeated_calls, Config.checkers_repeated_calls;
-        PrintfArgs.callback_printf_args, Config.checkers_enabled;
-        AnnotationReachability.checker, Config.checkers_enabled;
+        PrintfArgs.callback_printf_args, enabled_by_default;
+        AnnotationReachability.checker, enabled_by_default;
         BufferOverrunChecker.checker, Config.bufferoverrun;
-        ThreadSafety.analyze_procedure, Config.threadsafety || Config.checkers_enabled;
+        ThreadSafety.analyze_procedure, enabled_by_default || Config.threadsafety;
       ] in
     (* make sure SimpleChecker.ml is not dead code *)
     if false then (let module SC = SimpleChecker.Make in ());
@@ -48,7 +54,7 @@ let active_procedure_checkers () =
   java_checkers @ c_cpp_checkers
 
 let active_cluster_checkers () =
-  [(ThreadSafety.file_analysis, Config.threadsafety || Config.checkers_enabled, Some Config.Java)]
+  [(ThreadSafety.file_analysis, enabled_by_default || Config.threadsafety, Some Config.Java)]
 
 let register () =
   let register registry (callback, active, language_opt) =

infer/src/integration/Buck.ml

@@ -51,7 +51,7 @@ let add_flavor_to_target target =
       target
   | None, (Linters | Capture) ->
       add "infer-capture-all"
-  | None, (Bufferoverrun | Checkers | Infer | Quandary | Siof | Threadsafety) ->
+  | None, (Bufferoverrun | Checkers | Infer | Quandary | Siof) ->
       add "infer"
   | None, (Eradicate | Tracing | Crashcontext) ->
       failwithf "Analyzer %s is Java-only; not supported with Buck flavors"

infer/tests/codetoanalyze/java/threadsafety/Makefile

@@ -8,7 +8,7 @@
 TESTS_DIR = ../../..
 
 ANALYZER = checkers
-INFER_OPTIONS =  --no-filtering --debug-exceptions
+INFER_OPTIONS = --threadsafety --no-filtering --debug-exceptions
 INFERPRINT_OPTIONS = --issues-tests
 SOURCES = $(wildcard *.java)