Fix unit test compilation with suppress_ovwarn changes

Author: sim642

src/domains/intDomainProperties.ml

@@ -23,9 +23,19 @@ sig
 end
 
 module type S = IntDomain.S with type int_t = Z.t
+module type S2 = IntDomain.S2 with type int_t = Z.t
+
+module MakeS2 (I: S): S2 =
+struct
+  include I
+
+  let starting ?suppress_ovwarn ik x = starting ik x
+  let ending ?suppress_ovwarn ik x = ending ik x
+  let of_interval ?suppress_ovwarn ik x = of_interval ik x
+end
 
 (* TODO: deduplicate with IntDomain, extension of IntDomWithDefaultIkind, inverse of OldDomainFacade? *)
-module WithIkind (I: S) (Ik: IntDomain.Ikind): OldSWithIkind =
+module WithIkind (I: S2) (Ik: IntDomain.Ikind): OldSWithIkind =
 struct
   include I
   module Ikind = Ik

tests/unit/cdomains/intDomainTest.ml

@@ -115,11 +115,11 @@ end
 module Ikind = struct let ikind () = Cil.ILong end
 module A = IntTest (IntDomain.Integers (IntOps.BigIntOps))
 module B = IntTest (IntDomain.Flat (IntDomain.Integers (IntOps.BigIntOps)))
-module C = IntTest (IntDomainProperties.WithIkind (IntDomain.DefExc) (Ikind))
+module C = IntTest (IntDomainProperties.WithIkind (IntDomainProperties.MakeS2 (IntDomain.DefExc)) (Ikind))
 
 module D = struct
   module T = struct
-    include IntDomainProperties.WithIkind (IntDomain.DefExc) (Ikind)
+    include IntDomainProperties.WithIkind (IntDomainProperties.MakeS2 (IntDomain.DefExc)) (Ikind)
     let of_excl_list xs = of_excl_list Cil.ILong xs
   end
 

tests/unit/cdomains/lvalTest.ml

@@ -2,7 +2,7 @@ open Goblint_lib
 open OUnit2
 open GoblintCil
 
-module ID = IntDomain.IntDomWithDefaultIkind (IntDomain.IntDomLifter (IntDomain.DefExc)) (IntDomain.PtrDiffIkind)
+module ID = IntDomain.IntDomWithDefaultIkind (IntDomain.IntDomLifter (IntDomainProperties.MakeS2 (IntDomain.DefExc))) (IntDomain.PtrDiffIkind)
 module Offs = Offset.MakeLattice (ID)
 module LV = AddressDomain.AddressLattice (Mval.MakeLattice (Offs))
 

tests/unit/maindomaintest.ml

@@ -41,10 +41,10 @@ let domains: (module Lattice.S) list = [
 
 let nonAssocDomains: (module Lattice.S) list = []
 
-let intDomains: (module IntDomainProperties.S) list = [
+let intDomains: (module IntDomainProperties.S2) list = [
   (module IntDomain.SOverflowUnlifter(IntDomain.Interval));
-  (module IntDomain.Enums);
-  (module IntDomain.Congruence);
+  (module IntDomainProperties.MakeS2 (IntDomain.Enums));
+  (module IntDomainProperties.MakeS2 (IntDomain.Congruence));
   (module IntDomain.SOverflowUnlifter(IntDomain.IntervalSet));
   (module IntDomain.SOverflowUnlifter(IntDomain.Bitfield));
   (* (module IntDomain.Flattened); *)
@@ -53,8 +53,8 @@ let intDomains: (module IntDomainProperties.S) list = [
   (* (module IntDomain.IntDomTuple); *)
 ]
 
-let nonAssocIntDomains: (module IntDomainProperties.S) list = [
-  (module IntDomain.DefExc);
+let nonAssocIntDomains: (module IntDomainProperties.S2) list = [
+  (module IntDomainProperties.MakeS2 (IntDomain.DefExc));
 ]
 
 (* TODO: make arbitrary ikind part of domain test for better efficiency *)
@@ -91,7 +91,7 @@ let nonAssocTestsuite =
 let old_intdomains intDomains =
   BatList.cartesian_product intDomains ikinds
   |> List.map (fun (d, ik) ->
-      let module D = (val d: IntDomainProperties.S) in
+      let module D = (val d: IntDomainProperties.S2) in
       let module Ikind = struct let ikind () = ik end in
       (module IntDomainProperties.WithIkind (D) (Ikind): IntDomainProperties.OldSWithIkind)
     )

tests/unit/solver/solverTest.ml

@@ -23,7 +23,7 @@ end
 
 (* domain is (reversed) integers *)
 module Ikind = struct let ikind () = Cil.ILong end
-module Int  = IntDomainProperties.WithIkind (IntDomain.DefExc) (Ikind)
+module Int  = IntDomainProperties.WithIkind (IntDomainProperties.MakeS2 (IntDomain.DefExc)) (Ikind)
 module IntR = Lattice.Reverse(Int)
 
 module ConstrSys = struct