Merge pull request #791 from goblint/wrapped-cil

Adapt to wrapped goblint-cil library

Author: sim642

goblint.opam

@@ -67,7 +67,7 @@ dev-repo: "git+https://github.com/goblint/analyzer.git"
 # on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
 # also remember to generate/adjust goblint.opam.locked!
 pin-depends: [
-  [ "goblint-cil.1.8.2" "git+https://github.com/goblint/cil.git#54b0c220a9cea4213ff596eadff877a6ec9b00fb" ]
+  [ "goblint-cil.1.8.2" "git+https://github.com/goblint/cil.git#1faa2355fd350c503b150e43c4577873928c30d9" ]
   # TODO: add back after release, only pinned for optimization (https://github.com/ocaml-ppx/ppx_deriving/pull/252)
   [ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
   # quoter workaround reverted for release, so no pin needed

goblint.opam.locked

@@ -120,7 +120,7 @@ version: "dev"
 pin-depends: [
   [
     "goblint-cil.1.8.2"
-    "git+https://github.com/goblint/cil.git#54b0c220a9cea4213ff596eadff877a6ec9b00fb"
+    "git+https://github.com/goblint/cil.git#1faa2355fd350c503b150e43c4577873928c30d9"
   ]
   [
     "apron.v0.9.13"

goblint.opam.template

@@ -1,7 +1,7 @@
 # on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
 # also remember to generate/adjust goblint.opam.locked!
 pin-depends: [
-  [ "goblint-cil.1.8.2" "git+https://github.com/goblint/cil.git#54b0c220a9cea4213ff596eadff877a6ec9b00fb" ]
+  [ "goblint-cil.1.8.2" "git+https://github.com/goblint/cil.git#1faa2355fd350c503b150e43c4577873928c30d9" ]
   # TODO: add back after release, only pinned for optimization (https://github.com/ocaml-ppx/ppx_deriving/pull/252)
   [ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
   # quoter workaround reverted for release, so no pin needed

gobview

@@ -1,4 +1,4 @@
-open Cil
+open GoblintCil
 (* Cannot use local module substitutions because ppx_import is still stuck at 4.07 AST: https://github.com/ocaml-ppx/ppx_import/issues/50#issuecomment-775817579. *)
 (* TODO: try again, because ppx_import is now removed *)
 

src/analyses/basePriv.mli

@@ -1,4 +1,4 @@
-open Cil
+open GoblintCil
 
 val is_global: Queries.ask -> varinfo -> bool
 val is_static: varinfo -> bool

src/analyses/baseUtil.mli

@@ -1,4 +1,5 @@
 (** Library function descriptor (specification). *)
+module Cil = GoblintCil
 
 (** Pointer argument access specification. *)
 module Access =

src/analyses/libraryDesc.ml

@@ -1,4 +1,5 @@
 (** Library function descriptor DSL. *)
+open GoblintCil
 
 (** See {!LibraryFunctions} implementation for example usage. *)
 

src/analyses/libraryDsl.mli

@@ -1,3 +1,5 @@
+open GoblintCil
+
 let effects: (string -> Cil.exp list -> (Cil.lval * _) list option) list ref = ref []
 let add_effects f = effects := f :: !effects
 let effects_for fname args = List.filter_map (fun f -> f fname args) !effects

src/analyses/libraryFunctionEffects.ml

@@ -1,3 +1,5 @@
 (* can't use Base.Main.store b/c of circular build - this is painful... *)
+open GoblintCil
+
 val add_effects : (string -> Cil.exp list -> (Cil.lval * ValueDomain.Compound.t) list option) -> unit
 val effects_for : string -> Cil.exp list -> (Cil.lval * ValueDomain.Compound.t) list list