Use relift deriver more

goblint · Jun 28, 2023 · 2e2bcc3 · 2e2bcc3
1 parent 816a6f5
commit 2e2bcc3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/cdomains/mHP.ml b/src/cdomains/mHP.ml
@@ -11,10 +11,7 @@ type t = {
   tid: ThreadIdDomain.ThreadLifted.t;
   created: ConcDomain.ThreadSet.t;
   must_joined: ConcDomain.ThreadSet.t;
-} [@@deriving eq, ord, hash]
-
-let relift {tid; created; must_joined} =
-  {tid = ThreadIdDomain.ThreadLifted.relift tid; created = ConcDomain.ThreadSet.relift created; must_joined = ConcDomain.ThreadSet.relift must_joined}
+} [@@deriving eq, ord, hash, relift]
 
 let current (ask:Queries.ask) =
   {

diff --git a/src/framework/analyses.ml b/src/framework/analyses.ml
@@ -32,8 +32,7 @@ end
 
 module Var =
 struct
-  type t = Node.t [@@deriving eq, ord, hash]
-  let relift = Node.relift
+  type t = Node.t [@@deriving eq, ord, hash, relift]
 
   let printXml f n =
     let l = Node.location n in

diff --git a/src/ppx/printable/ppx_deriving_printable.ml b/src/ppx/printable/ppx_deriving_printable.ml
@@ -5,6 +5,7 @@ struct
   let name = "relift"
 end
 
+(* TODO: Map1 should also do variants *)
 module ReliftDeriver = Deriver.Make (Product.Map1.Make (ReliftArg))
 let relift_deriving = ReliftDeriver.register ()