From 4ff027ee606d3586cc0d8bf63f6d2f4cbee779f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Tue, 19 Jul 2022 15:58:26 +0200
Subject: [PATCH] [crowbar] Uses Eva public API instead of Db.Value.
---
tests/crowbar/constfold.ml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/tests/crowbar/constfold.ml b/tests/crowbar/constfold.ml
index 8b176ca248d..1067b157474 100644
--- a/tests/crowbar/constfold.ml
+++ b/tests/crowbar/constfold.ml
@@ -210,11 +210,8 @@ let run typ expr =
let kf = Globals.Functions.find_by_name "f" in
let r = Globals.Vars.find_from_astinfo "result" Cil_types.VGlobal in
let ret = Kernel_function.find_return kf in
- let state = Db.Value.get_stmt_state ret in
- let v1 =
- !Db.Value.eval_expr
- ~with_alarms:CilE.warn_none_mode state (Cil.evar ~loc r)
- in
+ let expr = Cil.evar ~loc r in
+ let v1 = Eva.Results.(before ret |> eval_exp expr |> as_cvalue) in
let itv =
try Cvalue.V.project_ival v1
with exn ->
--
GitLab