From 7705ffbc31cfd3c2575cd04078e0b2cb57504ffd Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Fri, 11 Nov 2016 02:23:18 -0800 Subject: [PATCH] [checkers] rename to_callee -> with_callsite Summary: There's not really a concept of callee here, so s/callee/callsite/, and "to" suggests we get the callee whereas we update it, so s/to/with/. Feel free to bikeshed further. Reviewed By: sblackshear Differential Revision: D4153426 fbshipit-source-id: 6ea762c --- infer/src/checkers/SinkTrace.ml | 8 ++++---- infer/src/checkers/SinkTrace.mli | 4 ++-- infer/src/checkers/Siof.ml | 6 ++++-- infer/src/checkers/SiofTrace.ml | 2 +- infer/src/checkers/Source.ml | 2 +- infer/src/checkers/Trace.ml | 4 ++-- infer/src/checkers/TraceElem.ml | 2 +- infer/src/quandary/CppTrace.ml | 4 ++-- infer/src/quandary/JavaTrace.ml | 4 ++-- infer/src/unit/TaintTests.ml | 2 +- infer/src/unit/TraceTests.ml | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/infer/src/checkers/SinkTrace.ml b/infer/src/checkers/SinkTrace.ml index e04de2fd1..53beecce0 100644 --- a/infer/src/checkers/SinkTrace.ml +++ b/infer/src/checkers/SinkTrace.ml @@ -22,8 +22,8 @@ module type S = sig (** get a path for each of the reportable flows to a sink in this trace *) val get_reportable_sink_paths : t -> trace_of_pname:(Procname.t -> t) -> sink_path list - (** convert of the sinks to callee sinks for the given call site *) - val to_callee : t -> CallSite.t -> t + (** update sink with the given call site *) + val with_callsite : t -> CallSite.t -> t end module MakeSink(TraceElem : TraceElem.S) = struct @@ -49,10 +49,10 @@ module Make (TraceElem : TraceElem.S) = struct (fun (passthroughs, _, sinks) -> passthroughs, sinks) (get_reportable_paths t ~trace_of_pname) - let to_callee t call_site = + let with_callsite t call_site = IList.fold_left (fun t_acc sink -> - let callee_sink = Sink.to_callee sink call_site in + let callee_sink = Sink.with_callsite sink call_site in add_sink callee_sink t_acc) initial (Sinks.elements (sinks t)) diff --git a/infer/src/checkers/SinkTrace.mli b/infer/src/checkers/SinkTrace.mli index 744da18c5..ad49b2e39 100644 --- a/infer/src/checkers/SinkTrace.mli +++ b/infer/src/checkers/SinkTrace.mli @@ -18,8 +18,8 @@ module type S = sig (** get a path for each of the reportable flows to a sink in this trace *) val get_reportable_sink_paths : t -> trace_of_pname:(Procname.t -> t) -> sink_path list - (** convert of the sinks to callee sinks for the given call site *) - val to_callee : t -> CallSite.t -> t + (** update sink with the given call site *) + val with_callsite : t -> CallSite.t -> t end module MakeSink (TraceElem : TraceElem.S) : diff --git a/infer/src/checkers/Siof.ml b/infer/src/checkers/Siof.ml index dd1ce42d9..c577b9b82 100644 --- a/infer/src/checkers/Siof.ml +++ b/infer/src/checkers/Siof.ml @@ -76,8 +76,10 @@ module TransferFunctions (CFG : ProcCfg.S) = struct let callsite = CallSite.make callee_pname loc in let callee_globals = match Summary.read_summary tenv pdesc callee_pname with - | Some (Domain.NonBottom trace) -> Domain.NonBottom (SiofTrace.to_callee trace callsite) - | _ -> Domain.Bottom in + | Some (Domain.NonBottom trace) -> + Domain.NonBottom (SiofTrace.with_callsite trace callsite) + | _ -> + Domain.Bottom in add_params_globals astate tenv pdesc loc params |> Domain.join callee_globals |> diff --git a/infer/src/checkers/SiofTrace.ml b/infer/src/checkers/SiofTrace.ml index 856e718d8..1300f271c 100644 --- a/infer/src/checkers/SiofTrace.ml +++ b/infer/src/checkers/SiofTrace.ml @@ -32,7 +32,7 @@ include SinkTrace.Make(struct let make kind site = { kind; site; } - let to_callee t site = { t with site; } + let with_callsite t site = { t with site; } let compare t1 t2 = CallSite.compare t1.site t2.site diff --git a/infer/src/checkers/Source.ml b/infer/src/checkers/Source.ml index b7bc2fce7..35bce0d21 100644 --- a/infer/src/checkers/Source.ml +++ b/infer/src/checkers/Source.ml @@ -50,5 +50,5 @@ module Dummy = struct let pp_element = pp end) - let to_callee t _ = t + let with_callsite t _ = t end diff --git a/infer/src/checkers/Trace.ml b/infer/src/checkers/Trace.ml index f8e6e4ff0..524edf593 100644 --- a/infer/src/checkers/Trace.ml +++ b/infer/src/checkers/Trace.ml @@ -245,7 +245,7 @@ module Make (Spec : Spec) = struct caller_trace.sources else IList.map - (fun sink -> Source.to_callee sink callee_site) + (fun sink -> Source.with_callsite sink callee_site) (Sources.elements non_footprint_callee_sources) |> Sources.of_list |> Sources.union caller_trace.sources in @@ -256,7 +256,7 @@ module Make (Spec : Spec) = struct caller_trace.sinks else IList.map - (fun sink -> Sink.to_callee sink callee_site) + (fun sink -> Sink.with_callsite sink callee_site) (Sinks.elements callee_trace.sinks) |> Sinks.of_list |> Sinks.union caller_trace.sinks in diff --git a/infer/src/checkers/TraceElem.ml b/infer/src/checkers/TraceElem.ml index 192393384..7b099abd8 100644 --- a/infer/src/checkers/TraceElem.ml +++ b/infer/src/checkers/TraceElem.ml @@ -25,7 +25,7 @@ module type S = sig val kind : t -> Kind.t val make : Kind.t -> CallSite.t -> t - val to_callee : t -> CallSite.t -> t + val with_callsite : t -> CallSite.t -> t val pp : F.formatter -> t -> unit diff --git a/infer/src/quandary/CppTrace.ml b/infer/src/quandary/CppTrace.ml index fee7dfb85..dee0e8ea3 100644 --- a/infer/src/quandary/CppTrace.ml +++ b/infer/src/quandary/CppTrace.ml @@ -79,7 +79,7 @@ module CppSource = struct | pname -> failwithf "Non-C++ procname %a in C++ analysis@." Procname.pp pname - let to_callee t callee_site = + let with_callsite t callee_site = { t with site = callee_site; } let compare src1 src2 = @@ -159,7 +159,7 @@ module CppSink = struct | pname -> failwithf "Non-C++ procname %a in C++ analysis@." Procname.pp pname - let to_callee t callee_site = + let with_callsite t callee_site = { t with site = callee_site; } let compare snk1 snk2 = diff --git a/infer/src/quandary/JavaTrace.ml b/infer/src/quandary/JavaTrace.ml index f967eac0b..ea0552db3 100644 --- a/infer/src/quandary/JavaTrace.ml +++ b/infer/src/quandary/JavaTrace.ml @@ -85,7 +85,7 @@ module JavaSource = struct | pname when BuiltinDecl.is_declared pname -> None | pname -> failwithf "Non-Java procname %a in Java analysis@." Procname.pp pname - let to_callee t callee_site = + let with_callsite t callee_site = { t with site = callee_site; } let compare src1 src2 = @@ -181,7 +181,7 @@ module JavaSink = struct | pname when BuiltinDecl.is_declared pname -> [] | pname -> failwithf "Non-Java procname %a in Java analysis@." Procname.pp pname - let to_callee t callee_site = + let with_callsite t callee_site = { t with site = callee_site; } let compare snk1 snk2 = diff --git a/infer/src/unit/TaintTests.ml b/infer/src/unit/TaintTests.ml index c96ec0a56..059b39f89 100644 --- a/infer/src/unit/TaintTests.ml +++ b/infer/src/unit/TaintTests.ml @@ -27,7 +27,7 @@ module MockTrace = Trace.Make(struct let compare = CallSite.compare let pp = CallSite.pp - let to_callee t _ = t + let with_callsite t _ = t module Set = PrettyPrintable.MakePPSet(struct type nonrec t = t diff --git a/infer/src/unit/TraceTests.ml b/infer/src/unit/TraceTests.ml index 89afa0fbe..e8171b8f9 100644 --- a/infer/src/unit/TraceTests.ml +++ b/infer/src/unit/TraceTests.ml @@ -54,7 +54,7 @@ module MockTraceElem = struct let pp_element = pp end) - let to_callee t _ = t + let with_callsite t _ = t end module MockSource = struct