From 6cc7926e23663b40f5d4687eb60631e599c85ba3 Mon Sep 17 00:00:00 2001 From: Sungkeun Cho Date: Fri, 10 Jan 2020 03:08:46 -0800 Subject: [PATCH] [inferbo] Use Ondemand.get_proc_desc Summary: We do not need to run analysis for getting formals. Reviewed By: ezgicicek Differential Revision: D19331316 fbshipit-source-id: 59b7ac7f2 --- infer/src/absint/SummaryPayload.ml | 6 ------ infer/src/absint/SummaryPayload.mli | 3 --- infer/src/bufferoverrun/bufferOverrunAnalysis.ml | 3 +-- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/infer/src/absint/SummaryPayload.ml b/infer/src/absint/SummaryPayload.ml index 10cbb4be0..cd48d958d 100644 --- a/infer/src/absint/SummaryPayload.ml +++ b/infer/src/absint/SummaryPayload.ml @@ -24,8 +24,6 @@ module type S = sig val read : caller_summary:Summary.t -> callee_pname:Procname.t -> t option - val read_proc_desc : caller_summary:Summary.t -> callee_pname:Procname.t -> Procdesc.t option - val read_toplevel_procedure : Procname.t -> t option end @@ -56,10 +54,6 @@ module Make (P : Payload) : S with type t = P.t = struct Ondemand.analyze_proc_name ~caller_summary callee_pname |> get_payload |> Option.map ~f:snd - let read_proc_desc ~caller_summary ~callee_pname = - Ondemand.analyze_proc_name ~caller_summary callee_pname |> get_payload |> Option.map ~f:fst - - let read_toplevel_procedure callee_pname = Ondemand.analyze_proc_name_no_caller callee_pname |> get_payload |> Option.map ~f:snd end diff --git a/infer/src/absint/SummaryPayload.mli b/infer/src/absint/SummaryPayload.mli index 440d0b600..6b042ab3e 100644 --- a/infer/src/absint/SummaryPayload.mli +++ b/infer/src/absint/SummaryPayload.mli @@ -29,9 +29,6 @@ module type S = sig val read : caller_summary:Summary.t -> callee_pname:Procname.t -> t option (** Return the payload for the given procedure. Runs the analysis on-demand if necessary. *) - val read_proc_desc : caller_summary:Summary.t -> callee_pname:Procname.t -> Procdesc.t option - (** Return the proc desc for the given procedure. Runs the analysis on-demand if necessary. *) - val read_toplevel_procedure : Procname.t -> t option end diff --git a/infer/src/bufferoverrun/bufferOverrunAnalysis.ml b/infer/src/bufferoverrun/bufferOverrunAnalysis.ml index 043edfdae..df13a109d 100644 --- a/infer/src/bufferoverrun/bufferOverrunAnalysis.ml +++ b/infer/src/bufferoverrun/bufferOverrunAnalysis.ml @@ -468,8 +468,7 @@ let cached_compute_invariant_map = | None -> let get_summary callee_pname = Payload.read ~caller_summary:summary ~callee_pname in let get_formals callee_pname = - Payload.read_proc_desc ~caller_summary:summary ~callee_pname - |> Option.map ~f:Procdesc.get_pvar_formals + Ondemand.get_proc_desc callee_pname |> Option.map ~f:Procdesc.get_pvar_formals in let inv_map = compute_invariant_map summary tenv integer_type_widths get_summary get_formals