From ef2b71294197067beadbaa04a942f6c8025cac30 Mon Sep 17 00:00:00 2001 From: Nikos Gorogiannis Date: Fri, 25 Jun 2021 13:45:05 -0700 Subject: [PATCH] [java] delete unused `skip-implementation` option and code Summary: No usage, no tests. Reviewed By: ezgicicek Differential Revision: D29393463 fbshipit-source-id: 42227f670 --- .inferconfig | 6 ------ infer/man/man1/infer-full.txt | 5 ----- infer/src/IR/inferconfig.ml | 4 ---- infer/src/IR/inferconfig.mli | 2 -- infer/src/base/Config.ml | 10 ---------- infer/src/base/Config.mli | 2 -- infer/src/java/jFrontend.ml | 6 ++---- 7 files changed, 2 insertions(+), 33 deletions(-) diff --git a/.inferconfig b/.inferconfig index d8e2d0048..312179286 100644 --- a/.inferconfig +++ b/.inferconfig @@ -7,11 +7,5 @@ "language": "Java", "source_contains": "_SHOULD_BE_SKIPPED_" } - ], - "skip-implementation": [ - { - "language": "Java", - "source_contains": "_SHOULD_SKIP_IMPLEMENTATION_" - } ] } diff --git a/infer/man/man1/infer-full.txt b/infer/man/man1/infer-full.txt index e987809cc..30a68c77a 100644 --- a/infer/man/man1/infer-full.txt +++ b/infer/man/man1/infer-full.txt @@ -2092,11 +2092,6 @@ INTERNAL OPTIONS --skip-analysis-in-path-reset Set --skip-analysis-in-path to the empty list. - --skip-implementation json - Matcher or list of matchers for names of files where we only want - to translate the method declaration, skipping the body of the - methods (Java only). - --skip-translation json Matcher or list of matchers for names of files that should not be analyzed at all. diff --git a/infer/src/IR/inferconfig.ml b/infer/src/IR/inferconfig.ml index 049a5f311..7cc129288 100644 --- a/infer/src/IR/inferconfig.ml +++ b/infer/src/IR/inferconfig.ml @@ -317,10 +317,6 @@ let skip_translation_matcher = FileOrProcMatcher.load_matcher (patterns_of_json_with_key Config.patterns_skip_translation) -let skip_implementation_matcher = - FileOrProcMatcher.load_matcher (patterns_of_json_with_key Config.patterns_skip_implementation) - - let load_filters () = { whitelist= Config.report_path_regex_whitelist ; blacklist= Config.report_path_regex_blacklist diff --git a/infer/src/IR/inferconfig.mli b/infer/src/IR/inferconfig.mli index 23e3dba76..0a0441a11 100644 --- a/infer/src/IR/inferconfig.mli +++ b/infer/src/IR/inferconfig.mli @@ -25,6 +25,4 @@ val never_return_null_matcher : SourceFile.t -> Procname.t -> bool val skip_translation_matcher : SourceFile.t -> Procname.t -> bool -val skip_implementation_matcher : SourceFile.t -> Procname.t -> bool - val modeled_expensive_matcher : (string -> bool) -> Procname.t -> bool diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml index 9c0bef7ad..92d347d14 100644 --- a/infer/src/base/Config.ml +++ b/infer/src/base/Config.ml @@ -1850,14 +1850,6 @@ and patterns_never_returning_null = "Matcher or list of matchers for functions that never return $(i,null)." ) -and patterns_skip_implementation = - let long = "skip-implementation" in - ( long - , CLOpt.mk_json ~long - "Matcher or list of matchers for names of files where we only want to translate the method \ - declaration, skipping the body of the methods (Java only)." ) - - and patterns_skip_translation = let long = "skip-translation" in ( long @@ -3247,8 +3239,6 @@ and patterns_modeled_expensive = match patterns_modeled_expensive with k, r -> ( and patterns_never_returning_null = match patterns_never_returning_null with k, r -> (k, !r) -and patterns_skip_implementation = match patterns_skip_implementation with k, r -> (k, !r) - and patterns_skip_translation = match patterns_skip_translation with k, r -> (k, !r) and pmd_xml = !pmd_xml diff --git a/infer/src/base/Config.mli b/infer/src/base/Config.mli index 6a3297876..e788f6fac 100644 --- a/infer/src/base/Config.mli +++ b/infer/src/base/Config.mli @@ -445,8 +445,6 @@ val patterns_modeled_expensive : string * Yojson.Basic.t val patterns_never_returning_null : string * Yojson.Basic.t -val patterns_skip_implementation : string * Yojson.Basic.t - val patterns_skip_translation : string * Yojson.Basic.t val pmd_xml : bool diff --git a/infer/src/java/jFrontend.ml b/infer/src/java/jFrontend.ml index a5204d1a2..ee1db3a8e 100644 --- a/infer/src/java/jFrontend.ml +++ b/infer/src/java/jFrontend.ml @@ -88,10 +88,8 @@ let add_edges (context : JContext.t) start_node exn_node exit_nodes method_body_ (** Add a concrete method. *) let add_cmethod source_file program icfg cm proc_name = let cn, _ = JBasics.cms_split cm.Javalib.cm_class_method_signature in - if - Inferconfig.skip_implementation_matcher source_file proc_name - || SourceFile.has_extension source_file ~ext:Config.kotlin_source_extension - then ignore (JTrans.create_empty_procdesc source_file program icfg cm proc_name) + if SourceFile.has_extension source_file ~ext:Config.kotlin_source_extension then + ignore (JTrans.create_empty_procdesc source_file program icfg cm proc_name) else match JTrans.create_cm_procdesc source_file program icfg cm proc_name with | None ->