Skip to content

Commit ccb2a6f

Browse files
committed
Merge branch 'master' of github.com:goblint/analyzer into parallelism_backwards_compat_1
2 parents f423d8e + 8f84f7c commit ccb2a6f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+4811
-1152
lines changed

.gitattributes

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# GitHub repository language overrides
2+
# https://github.com/github-linguist/linguist/blob/main/docs/overrides.md
3+
4+
# currently only dune-project is classified: https://github.com/github-linguist/linguist/pull/7126
5+
dune linguist-language=dune
6+
dune.inc linguist-language=dune
7+
8+
# avoid misclassification as Standard ML
9+
*.ml linguist-language=ocaml
10+
*.mli linguist-language=ocaml
11+
12+
# cram tests are classified as Raku/Terra/Turing, cram isn't separate language so consider them also dune
13+
*.t linguist-language=dune

goblint.opam

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ dev-repo: "git+https://github.com/goblint/analyzer.git"
9999
# also remember to generate/adjust goblint.opam.locked!
100100
available: os-family != "bsd" & os-distribution != "alpine" & (arch != "arm64" | os = "macos")
101101
pin-depends: [
102-
# published goblint-cil 2.0.5 is currently up-to-date, but pinned for reproducibility
103-
[ "goblint-cil.2.0.5" "git+https://github.com/goblint/cil.git#f5ee39bd344dc74e2a10e407d877e0ddf73c9c6f" ]
102+
# published goblint-cil 2.0.6 is currently up-to-date, but pinned for reproducibility
103+
[ "goblint-cil.2.0.6" "git+https://github.com/goblint/cil.git#8385ab315bc7461f6801af57673c64731bfa036a" ]
104104
# pinned for stability (https://github.com/goblint/analyzer/issues/1520), remove after new camlidl release
105105
[ "camlidl.1.12" "git+https://github.com/xavierleroy/camlidl.git#1c1e87e3f56c2c6b3226dd0af3510ef414b462d0" ]
106106
# pinned for stability (https://github.com/goblint/analyzer/issues/1520), remove after new apron release

goblint.opam.locked

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ depends: [
6666
"fileutils" {= "0.6.4"}
6767
"fmt" {= "0.9.0"}
6868
"fpath" {= "0.7.3"}
69-
"goblint-cil" {= "2.0.5"}
69+
"goblint-cil" {= "2.0.6"}
7070
"hex" {= "1.5.0"}
7171
"integers" {= "0.7.0"}
7272
"json-data-encoding" {= "1.0.1"}
@@ -141,8 +141,8 @@ post-messages: [
141141
]
142142
pin-depends: [
143143
[
144-
"goblint-cil.2.0.5"
145-
"git+https://github.com/goblint/cil.git#f5ee39bd344dc74e2a10e407d877e0ddf73c9c6f"
144+
"goblint-cil.2.0.6"
145+
"git+https://github.com/goblint/cil.git#8385ab315bc7461f6801af57673c64731bfa036a"
146146
]
147147
[
148148
"camlidl.1.12"

goblint.opam.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# also remember to generate/adjust goblint.opam.locked!
33
available: os-family != "bsd" & os-distribution != "alpine" & (arch != "arm64" | os = "macos")
44
pin-depends: [
5-
# published goblint-cil 2.0.5 is currently up-to-date, but pinned for reproducibility
6-
[ "goblint-cil.2.0.5" "git+https://github.com/goblint/cil.git#f5ee39bd344dc74e2a10e407d877e0ddf73c9c6f" ]
5+
# published goblint-cil 2.0.6 is currently up-to-date, but pinned for reproducibility
6+
[ "goblint-cil.2.0.6" "git+https://github.com/goblint/cil.git#8385ab315bc7461f6801af57673c64731bfa036a" ]
77
# pinned for stability (https://github.com/goblint/analyzer/issues/1520), remove after new camlidl release
88
[ "camlidl.1.12" "git+https://github.com/xavierleroy/camlidl.git#1c1e87e3f56c2c6b3226dd0af3510ef414b462d0" ]
99
# pinned for stability (https://github.com/goblint/analyzer/issues/1520), remove after new apron release

gobview

src/analyses/apron/relationAnalysis.apron.ml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,12 @@ struct
740740
in
741741
({ f } : Queries.ask) in
742742
let rel = RD.assert_inv dummyask rel e false (no_overflow ask e_orig) in (* assume *)
743-
let rel = RD.keep_vars rel (List.map RV.local vars) in (* restrict *)
743+
let rel =
744+
if GobConfig.get_bool "ana.apron.strengthening" then
745+
RD.keep_vars rel (List.map RV.local vars) (* restrict *)
746+
else
747+
rel (* naive unassume: will be homogeneous join below *)
748+
in
744749

745750
(* TODO: parallel write_global? *)
746751
let st =

0 commit comments

Comments
 (0)