simon/sidekick
1
0
Fork 0
mirror of https://github.com/c-cube/sidekick.git synced 2025-12-06 03:05:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(CC): bug introduced by sharing mutable lazy state

Browse source
This commit is contained in:
Simon Cruanes 2022-01-10 12:11:32 -05:00
parent 78df8252dc
commit a33029129e
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cc/Sidekick_cc.ml
View file

@ -449,6 +449,7 @@ module Make (A: CC_ARG)
let create(): t = { lits=[]; th_lemmas=[] } let create(): t = { lits=[]; th_lemmas=[] }
let[@inline] copy self : t = {self with lits=self.lits}
let[@inline] add_lit (self:t) lit = self.lits <- lit :: self.lits let[@inline] add_lit (self:t) lit = self.lits <- lit :: self.lits
let[@inline] add_th (self:t) lit hyps pr : unit = let[@inline] add_th (self:t) lit hyps pr : unit =
self.th_lemmas <- (lit,hyps,pr) :: self.th_lemmas self.th_lemmas <- (lit,hyps,pr) :: self.th_lemmas
@ -859,6 +860,7 @@ module Make (A: CC_ARG)
(* true literals explaining why t1=t2 *) (* true literals explaining why t1=t2 *)
let guard = st.lits in let guard = st.lits in
(* get a proof of [guard /\ ¬lit] being absurd, to propagate [lit] *) (* get a proof of [guard /\ ¬lit] being absurd, to propagate [lit] *)
let st = Expl_state.copy st in (* do not modify shared st *)
Expl_state.add_lit st (Lit.neg lit); Expl_state.add_lit st (Lit.neg lit);
let _, pr = lits_and_proof_of_expl cc st in let _, pr = lits_and_proof_of_expl cc st in
guard, pr guard, pr

18
src/sat/Solver.ml
View file

@ -1740,7 +1740,9 @@ module Make(Plugin : PLUGIN)
let check_consequence_lits_false_ self l : unit = let check_consequence_lits_false_ self l : unit =
let store = self.store in let store = self.store in
match List.find (Atom.is_true store) l with Log.debugf 50 (fun k->k "(@[sat.check-consequence-lits: %a@])"
(Util.pp_list (Atom.debug store)) l);
match List.find (fun a -> Atom.is_true store a) l with
| a -> | a ->
invalid_argf invalid_argf
"slice.acts_propagate:@ Consequence should contain only false literals,@ \ "slice.acts_propagate:@ Consequence should contain only false literals,@ \
@ -1753,26 +1755,28 @@ module Make(Plugin : PLUGIN)
match expl with match expl with
| Solver_intf.Consequence mk_expl -> | Solver_intf.Consequence mk_expl ->
let p = make_atom_ self f in let p = make_atom_ self f in
Log.debugf 30
(fun k->k "(@[sat.propagate-from-theory@ %a@])" (Atom.debug store) p);
if Atom.is_true store p then () if Atom.is_true store p then ()
else if Atom.is_false store p then ( else if Atom.is_false store p then (
let lits, proof = mk_expl() in let lits, proof = mk_expl() in
let l = List.rev_map (fun f -> Atom.neg @@ make_atom_ self f) lits in let guard = List.rev_map (fun f -> Atom.neg @@ make_atom_ self f) lits in
check_consequence_lits_false_ self l; check_consequence_lits_false_ self guard;
let c = Clause.make_l store ~removable:true (p :: l) proof in let c = Clause.make_l store ~removable:true (p::guard) proof in
raise_notrace (Th_conflict c) raise_notrace (Th_conflict c)
) else ( ) else (
insert_var_order self (Atom.var p); insert_var_order self (Atom.var p);
let c = lazy ( let c = lazy (
let lits, proof = mk_expl () in let lits, proof = mk_expl () in
let l = List.rev_map (fun f -> Atom.neg @@ make_atom_ self f) lits in let guard = List.rev_map (fun f -> Atom.neg @@ make_atom_ self f) lits in
(* note: we can check that invariant here in the [lazy] block, (* note: we can check that invariant here in the [lazy] block,
as conflict analysis will run in an environment where as conflict analysis will run in an environment where
the literals should be true anyway, since it's an extension of the the literals should be true anyway, since it's an extension of the
current trail current trail
(otherwise the propagated lit would have been backtracked and (otherwise the propagated lit would have been backtracked and
discarded already.) *) discarded already.) *)
check_consequence_lits_false_ self l; check_consequence_lits_false_ self guard;
Clause.make_l store ~removable:true (p :: l) proof Clause.make_l store ~removable:true (p::guard) proof
) in ) in
let level = decision_level self in let level = decision_level self in
Stat.incr self.n_propagations; Stat.incr self.n_propagations;