From 5da15d1a103aa404d47215a225705831e58a0a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Tue, 23 Jul 2024 11:36:59 +0200
Subject: [PATCH] =?UTF-8?q?[region]=C2=A0stabilization=20of=20region=20cou?=
=?UTF-8?q?nters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/plugins/region/store.ml | 18 ++++++++++--------
.../tests/region/oracle/blob_region.res.oracle | 10 +++++-----
.../region/tests/region/oracle/swap.res.oracle | 10 +++++-----
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/plugins/region/store.ml b/src/plugins/region/store.ml
index 4e964e42b37..a1bd51e505e 100644
--- a/src/plugins/region/store.ml
+++ b/src/plugins/region/store.ml
@@ -27,18 +27,20 @@
module Imap = Map.Make(Int)
type 'a rref = int
-type 'a store = 'a Imap.t ref
+type 'a store = {
+ mutable rid : int ;
+ mutable map : 'a Imap.t ;
+}
-let new_store () = ref Imap.empty
-let copy r = ref !r
-let rid = ref 0
+let new_store () = { rid = 0 ; map = Imap.empty }
+let copy r = { rid = r.rid ; map = r.map }
let make s v =
- let k = incr rid ; !rid in
- s := Imap.add k v !s ; k
+ let k = succ s.rid in
+ s.rid <- k ; s.map <- Imap.add k v s.map ; k
-let get s k = Imap.find k !s
-let set s k v = s := Imap.add k v !s
+let get s k = Imap.find k s.map
+let set s k v = s.map <- Imap.add k v s.map
let eq _s i j = (i == j)
diff --git a/src/plugins/region/tests/region/oracle/blob_region.res.oracle b/src/plugins/region/tests/region/oracle/blob_region.res.oracle
index f1a5f86d8eb..68162db150d 100644
--- a/src/plugins/region/tests/region/oracle/blob_region.res.oracle
+++ b/src/plugins/region/tests/region/oracle/blob_region.res.oracle
@@ -5,9 +5,9 @@
R0004: --- 0b ;
R0001: -W- p (int *) 64b (*R0004) ;
[region] Function struct_blob:
- R0009: --- y 64b 0..32 [0]: R000a ;
- R000a: --- 0b ;
- R0007: -W- p (int *) 64b (*R000a) ;
+ R0003: --- y 64b 0..32 [0]: R0004 ;
+ R0004: --- 0b ;
+ R0001: -W- p (int *) 64b (*R0004) ;
[region] Function var_blob:
- R000f: --- x 0b ;
- R000d: -W- p (int *) 64b (*R000f) ;
+ R0003: --- x 0b ;
+ R0001: -W- p (int *) 64b (*R0003) ;
diff --git a/src/plugins/region/tests/region/oracle/swap.res.oracle b/src/plugins/region/tests/region/oracle/swap.res.oracle
index 3117fb686d5..49268e6ca29 100644
--- a/src/plugins/region/tests/region/oracle/swap.res.oracle
+++ b/src/plugins/region/tests/region/oracle/swap.res.oracle
@@ -6,8 +6,8 @@
R0001: R-- b (int *) 64b (*R0007) ;
R0008: RW- tmp (int) 32b ;
[region] Function swap_separated:
- R0013: R-- a (int *) 64b (*R0016) ;
- R0016: RW- A: (int) 32b ;
- R0017: R-- b (int *) 64b (*R001a) ;
- R001a: RW- B: (int) 32b ;
- R001b: RW- tmp (int) 32b ;
+ R0001: R-- a (int *) 64b (*R0004) ;
+ R0004: RW- A: (int) 32b ;
+ R0005: R-- b (int *) 64b (*R0008) ;
+ R0008: RW- B: (int) 32b ;
+ R0009: RW- tmp (int) 32b ;
--
GitLab