From b46d23cb992aee07038815d1605d34f0cc4ece4c Mon Sep 17 00:00:00 2001
From: Valentin Perrelle <valentin.perrelle@cea.fr>
Date: Thu, 18 Nov 2021 15:07:59 +0100
Subject: [PATCH] [Eva] api: Callsites are always retrieved by caller
---
src/plugins/value/Eva.mli | 3 +--
src/plugins/value/utils/results.ml | 8 --------
src/plugins/value/utils/results.mli | 3 +--
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/plugins/value/Eva.mli b/src/plugins/value/Eva.mli
index 1b42840150a..04c20ad4358 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 9a9a4a23e2e..18a71615242 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 d200cddfd41..bce0189d274 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.
--
GitLab