From 6c14647eae86745d87f1f78df0fddc7facab9314 Mon Sep 17 00:00:00 2001 From: Jeremy Dubreil Date: Fri, 3 Mar 2017 20:33:39 -0800 Subject: [PATCH] [infer][ondemand] remove unused `Idenv.create_from_idenv` function Summary: This function was actually doing the same as `Idenv.create`. Reviewed By: cristianoc Differential Revision: D4654241 fbshipit-source-id: 87c098b --- infer/src/checkers/idenv.ml | 5 ----- infer/src/checkers/idenv.mli | 1 - infer/src/eradicate/eradicate.ml | 7 +++---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/infer/src/checkers/idenv.ml b/infer/src/checkers/idenv.ml index 799838fa2..5fd60d746 100644 --- a/infer/src/checkers/idenv.ml +++ b/infer/src/checkers/idenv.ml @@ -29,11 +29,6 @@ let create proc_desc = let map = lazy (create_ proc_desc) in map -(* create an idenv for another procedure *) -let create_from_idenv _ proc_desc = - let map = lazy (create_ proc_desc) in - map - let lookup map_ id = let map = Lazy.force map_ in try diff --git a/infer/src/checkers/idenv.mli b/infer/src/checkers/idenv.mli index 1ed572a80..3a3351284 100644 --- a/infer/src/checkers/idenv.mli +++ b/infer/src/checkers/idenv.mli @@ -16,7 +16,6 @@ open! IStd type t val create : Procdesc.t -> t -val create_from_idenv : t -> Procdesc.t -> t val lookup : t -> Ident.t -> Exp.t option val expand_expr : t -> Exp.t -> Exp.t diff --git a/infer/src/eradicate/eradicate.ml b/infer/src/eradicate/eradicate.ml index aac868cd6..413cd3661 100644 --- a/infer/src/eradicate/eradicate.ml +++ b/infer/src/eradicate/eradicate.ml @@ -175,8 +175,7 @@ struct let ann_sig = Models.get_modelled_annotated_signature (Procdesc.get_attributes pdesc) in let loc = Procdesc.get_loc pdesc in - let idenv_pn = Idenv.create_from_idenv idenv pdesc in - (ann_sig, loc, idenv_pn) in + (ann_sig, loc, Idenv.create pdesc) in let checks', calls_this' = if do_checks then checks, calls_this else @@ -400,7 +399,7 @@ module Main = (** Eradicate checker for Java @Nullable annotations. *) let callback_eradicate - ({ Callbacks.get_proc_desc; idenv; proc_name } as callback_args) = + ({ Callbacks.get_proc_desc; proc_name } as callback_args) = let checks = { TypeCheck.eradicate = true; @@ -409,7 +408,7 @@ let callback_eradicate } in let callbacks = let analyze_ondemand _ pdesc = - let idenv_pname = Idenv.create_from_idenv idenv pdesc in + let idenv_pname = Idenv.create pdesc in Main.callback checks { callback_args with Callbacks.idenv = idenv_pname;