diff --git a/src/plugins/value/Eva.mli b/src/plugins/value/Eva.mli index 1b42840150ab4c5b7d8984f8a6b733b00561840c..04c20ad435892550e84b83dcf8f55fc25a9fde9b 100644 --- a/src/plugins/value/Eva.mli +++ b/src/plugins/value/Eva.mli @@ -113,8 +113,7 @@ module Results: sig (* Callers / Callees / Callsites *) val callers : Cil_types.kernel_function -> Cil_types.kernel_function list - val callsites : Cil_types.kernel_function -> Cil_types.stmt list - val callsites_per_caller : Cil_types.kernel_function -> + val callsites : Cil_types.kernel_function -> (Cil_types.kernel_function * Cil_types.stmt list) list (* Returns the kernel functions called in the given statement. diff --git a/src/plugins/value/utils/results.ml b/src/plugins/value/utils/results.ml index 9a9a4a23e2e30c065ebaa61efe66a4ac1f6f9d2c..18a71615242f6be4b3ef362a3c42e009d0bb9f4f 100644 --- a/src/plugins/value/utils/results.ml +++ b/src/plugins/value/utils/results.ml @@ -742,14 +742,6 @@ let callers kf = let uniq_sites = List.sort_uniq Cil_datatype.Stmt.compare let callsites kf = - let f = function - | [] | (_,Cil_types.Kglobal) :: _ -> None - | (_,Kstmt stmt) :: _-> Some stmt - in - at_start_of kf |> callstacks |> - List.filter_map f |> uniq_sites - -let callsites_per_caller kf = let module Map = Kernel_function.Map in let f acc = function | [] | (_,Cil_types.Kglobal) :: _ -> acc diff --git a/src/plugins/value/utils/results.mli b/src/plugins/value/utils/results.mli index d200cddfd417c721d698235d53a1e866a2391d2a..bce0189d274140bb2c029693cd866223d6cae5f2 100644 --- a/src/plugins/value/utils/results.mli +++ b/src/plugins/value/utils/results.mli @@ -116,8 +116,7 @@ val is_reachable : Cil_types.stmt -> bool (* reachable by the analysis, not by t (* Callers / Callees / Callsites *) val callers : Cil_types.kernel_function -> Cil_types.kernel_function list -val callsites : Cil_types.kernel_function -> Cil_types.stmt list -val callsites_per_caller : Cil_types.kernel_function -> +val callsites : Cil_types.kernel_function -> (Cil_types.kernel_function * Cil_types.stmt list) list (* Returns the kernel functions called in the given statement.