From 0f4394503bc0c5e3b09f34f40c8e144861977ce7 Mon Sep 17 00:00:00 2001 From: Nikos Gorogiannis Date: Mon, 5 Jul 2021 07:37:00 -0700 Subject: [PATCH] [config] remove dead flag Summary: `call-graph-schedule` was a boolean, now we have a variant type for scheduler. Reviewed By: jvillard Differential Revision: D29547773 fbshipit-source-id: ec787065c --- infer/man/man1/infer-full.txt | 4 ---- infer/src/backend/InferAnalyze.ml | 19 +++++++------------ infer/src/base/Config.ml | 6 ------ infer/src/base/Config.mli | 2 -- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/infer/man/man1/infer-full.txt b/infer/man/man1/infer-full.txt index 70e78eca0..eea84292d 100644 --- a/infer/man/man1/infer-full.txt +++ b/infer/man/man1/infer-full.txt @@ -1502,10 +1502,6 @@ INTERNAL OPTIONS --buck-targets-blacklist-reset Set --buck-targets-blacklist to the empty list. - --call-graph-schedule - Activates: use call graph for scheduling analysis (Conversely: - --no-call-graph-schedule) - --no-capture Deactivates: capture and translate source files into infer's intermediate language for analysis (Conversely: --capture) diff --git a/infer/src/backend/InferAnalyze.ml b/infer/src/backend/InferAnalyze.ml index c23355104..cc4698b13 100644 --- a/infer/src/backend/InferAnalyze.ml +++ b/infer/src/backend/InferAnalyze.ml @@ -11,7 +11,6 @@ open! IStd module F = Format module L = Logging -module CLOpt = CommandLineOption let clear_caches_except_lrus () = Summary.OnDisk.clear_cache () ; @@ -134,17 +133,13 @@ let get_source_files_to_analyze ~changed_files = let tasks_generator_builder_for sources = - if Config.call_graph_schedule then ( - CLOpt.warnf "WARNING: '--call-graph-schedule' is deprecated. Use '--scheduler' instead.@." ; - SyntacticCallGraph.make sources ) - else - match Config.scheduler with - | File -> - FileScheduler.make sources - | Restart -> - RestartScheduler.make sources - | SyntacticCallGraph -> - SyntacticCallGraph.make sources + match Config.scheduler with + | File -> + FileScheduler.make sources + | Restart -> + RestartScheduler.make sources + | SyntacticCallGraph -> + SyntacticCallGraph.make sources let analyze source_files_to_analyze = diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml index 0acccee48..bd3882c3f 100644 --- a/infer/src/base/Config.ml +++ b/infer/src/base/Config.ml @@ -856,10 +856,6 @@ and buck_targets_blacklist = $(b,--buck-compilation-database)." -and call_graph_schedule = - CLOpt.mk_bool ~long:"call-graph-schedule" ~default:false "use call graph for scheduling analysis" - - and capture = CLOpt.mk_bool ~long:"capture" ~default:true "capture and translate source files into infer's intermediate language for analysis" @@ -2942,8 +2938,6 @@ and buck_mode : BuckMode.t option = and buck_targets_blacklist = RevList.to_list !buck_targets_blacklist -and call_graph_schedule = !call_graph_schedule - and capture = !capture and capture_blacklist = !capture_blacklist diff --git a/infer/src/base/Config.mli b/infer/src/base/Config.mli index 4da7889af..a64451c3f 100644 --- a/infer/src/base/Config.mli +++ b/infer/src/base/Config.mli @@ -191,8 +191,6 @@ val buck_out_gen : string val buck_targets_blacklist : string list -val call_graph_schedule : bool - val capture : bool val capture_blacklist : string option