Merge branch 'master' into svcomp24-dev

goblint · Nov 23, 2023 · e0a0692 · e0a0692
2 parents d629d14 + 2f5e555
commit e0a0692
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/unlocked.yml b/.github/workflows/unlocked.yml
@@ -160,7 +160,8 @@ jobs:
 
       - name: Downgrade dependencies
         # must specify ocaml-base-compiler again to prevent it from being downgraded
-        run: opam install $(opam exec -- opam-0install --prefer-oldest goblint ocaml-variants.4.14.0+options ocaml-option-flambda)
+        # prevent num downgrade to avoid dune/jbuilder error: https://github.com/ocaml/dune/issues/5280
+        run: opam install $(opam exec -- opam-0install --prefer-oldest goblint ocaml-variants.4.14.0+options ocaml-option-flambda num.1.4)
 
       - name: Build
         run: ./make.sh nat

diff --git a/src/domains/queries.ml b/src/domains/queries.ml
@@ -331,8 +331,8 @@ struct
     | Any (MustTermLoop _) -> 53
     | Any MustTermAllLoops -> 54
     | Any IsEverMultiThreaded -> 55
-    | Any (TmpSpecial _) -> 53
-    | Any (IsAllocVar _) -> 54
+    | Any (TmpSpecial _) -> 56
+    | Any (IsAllocVar _) -> 57
 
   let rec compare a b =
     let r = Stdlib.compare (order a) (order b) in