Skip to content

Commit

Permalink
Fix soudness bug in Enum
Browse files Browse the repository at this point in the history
The PR OCamlPro#1078 introduces a soundness bug in `assume_distinct`. We have
to propagate explanations of singleton domains, otherwise we may raise
Inconsistency with an empty explanation.

Add a test that caught the bug.
  • Loading branch information
Halbaroth committed Apr 5, 2024
1 parent 7e1fdbf commit ae87ec5
Show file tree
Hide file tree
Showing 4 changed files with 319 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/lib/reasoners/enum_rel.ml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ module Domain = struct

let[@inline always] choose { constrs; _ } = HSS.choose constrs

let[@inline always] as_singleton { constrs; _ } =
let[@inline always] as_singleton { constrs; ex } =
if HSS.cardinal constrs = 1 then
Some (HSS.choose constrs)
Some (HSS.choose constrs, ex)
else
None

Expand Down Expand Up @@ -128,10 +128,10 @@ module Domains = struct

let get r t =
match Th.embed r with
| Cons (r, _) ->
| Cons (c, _) ->
(* For sake of efficiency, we don't look in the map if the
semantic value is a constructor. *)
Domain.singleton ~ex:Explanation.empty r
Domain.singleton ~ex:Explanation.empty c
| _ ->
try MX.find r t.domains
with Not_found ->
Expand Down Expand Up @@ -297,14 +297,16 @@ let assume_distinct ~ex r1 r2 env =
let d2 = Domains.get r2 env.domains in
let env =
match Domain.as_singleton d1 with
| Some c ->
| Some (c, ex1) ->
let ex = Ex.union ex1 ex in
let nd = Domain.remove ~ex c d2 in
tighten_domain r2 nd env
| None ->
env
in
match Domain.as_singleton d2 with
| Some c ->
| Some (c, ex2) ->
let ex = Ex.union ex2 ex in
let nd = Domain.remove ~ex c d1 in
tighten_domain r1 nd env
| None ->
Expand Down Expand Up @@ -364,9 +366,9 @@ let propagate_domains env =
Domains.propagate
(fun eqs rr d ->
match Domain.as_singleton d with
| Some c ->
| Some (c, ex) ->
let nr = Th.is_mine (Cons (c, X.type_info rr)) in
let eq = Literal.LSem (LR.mkv_eq rr nr), d.ex, Th_util.Other in
let eq = Literal.LSem (LR.mkv_eq rr nr), ex, Th_util.Other in
eq :: eqs
| None ->
eqs
Expand Down
292 changes: 292 additions & 0 deletions tests/dune.inc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions tests/sum/testfile-sum019.ae
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
type house = H1 | H2 | H3 | H4

logic h1, h2 : house

predicate leftof(h1: house, h2: house) =
(h2 = H2 -> h1 <> H2 and h1 <> H3 and h1 <> H4) (* h1 = H1 *)
and
(h2 = H3 -> h1 <> H1 and h1 <> H3 and h1 <> H4) (* h1 = H2 *)
and
(h2 = H4 -> h1 <> H1 and h1 <> H2 and h1 <> H4) (* h1 = H3 *)
and
(h2 = H1 -> h1 <> H1 and h1 <> H2 and h1 <> H3) (* h1 = H4 *)

axiom clue : leftof(h1, h2)
goal g : false
2 changes: 2 additions & 0 deletions tests/sum/testfile-sum019.expected
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

unknown

0 comments on commit ae87ec5

Please sign in to comment.