From f1d6d9c89f382ecb61e522222492e655577ebce9 Mon Sep 17 00:00:00 2001 From: Valentin Perrelle <valentin.perrelle@cea.fr> Date: Mon, 7 Feb 2022 16:55:16 +0100 Subject: [PATCH] [Impact] Use the new Eva API --- src/plugins/impact/compute_impact.ml | 8 ++++---- src/plugins/impact/register_gui.ml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/impact/compute_impact.ml b/src/plugins/impact/compute_impact.ml index 4305f65b876..a4579f1fb6f 100644 --- a/src/plugins/impact/compute_impact.ml +++ b/src/plugins/impact/compute_impact.ml @@ -332,8 +332,8 @@ let downward_one_call_node wl (pnode, _ as node) caller_kf pdg = | Key.SigCallKey(id, key) -> let stmt = Key.call_from_id id in - let called_kfs = Db.Value.call_to_kernel_function stmt in - KFS.iter + let called_kfs = Eva.Results.callee stmt in + List.iter (fun called_kf -> let called_pdg = !Db.Pdg.get called_kf in let nodes_callee, pdg_ok = @@ -452,7 +452,7 @@ let all_upward_callers wl kfs = let pdg_caller = !Db.Pdg.get caller in List.iter (aux_call (caller, pdg_caller) (kf, pdg_kf)) callsites; KFS.add caller todo - ) todo (!Db.Value.callers kf); + ) todo (Eva.Results.callsites kf); ) else todo in @@ -536,7 +536,7 @@ let initial_worklist ?(skip=Locations.Zone.bottom) ?(reason=false) nodes kf = let initial_nodes ~skip kf stmt = Options.debug ~level:3 "computing initial nodes for %d" stmt.sid; let pdg = !Db.Pdg.get kf in - if Db.Value.is_reachable_stmt stmt then + if Eva.Results.is_reachable stmt then try let all = !Db.Pdg.find_simple_stmt_nodes pdg stmt in let filter n = match PdgTypes.Node.elem_key n with diff --git a/src/plugins/impact/register_gui.ml b/src/plugins/impact/register_gui.ml index 38bba42a819..75e1f7a1487 100644 --- a/src/plugins/impact/register_gui.ml +++ b/src/plugins/impact/register_gui.ml @@ -208,7 +208,7 @@ let impact_statement = let impact_statement_ui (main_ui:Design.main_window_extension_points) s = - let val_computed = Db.Value.is_computed () in + let val_computed = Eva.Analysis.is_computed () in ignore (impact_statement (*restriction*)Locations.Zone.top s); if not val_computed then main_ui#reset () -- GitLab