Skip to content

Commit

Permalink
Catch Step_limit_reached consistently with Timeout
Browse files Browse the repository at this point in the history
This is a partial fix for #1244 that only addresses the fatal error
issue, but not incrementality.
  • Loading branch information
bclement-ocp committed Oct 7, 2024
1 parent 50835c0 commit bbe2eaa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/lib/frontend/frontend.ml
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ module Make(SAT : Sat_solver_sig.S) : S with type sat_env = SAT.t = struct
or to increase your timeouts. \
Returned unknown reason = %a@]"
Sat_solver_sig.pp_ae_unknown_reason_opt ur;
Fmt.pf ppf "()"

| Some model ->
Models.pp ppf model
Expand Down
3 changes: 3 additions & 0 deletions src/lib/reasoners/satml_frontend.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,7 @@ module Make (Th : Theory.S) : Sat_solver_sig.S = struct
with
| Satml.Unsat lc -> raise (IUnsat (env, make_explanation lc))
| Util.Timeout -> i_dont_know env (Timeout ProofSearch)
| Util.Step_limit_reached n -> i_dont_know env (Step_limit n)
| Satml.Sat ->
try
do_case_split env Util.BeforeMatching;
Expand Down Expand Up @@ -1205,6 +1206,7 @@ module Make (Th : Theory.S) : Sat_solver_sig.S = struct

with
| Util.Timeout -> i_dont_know env (Timeout ProofSearch)
| Util.Step_limit_reached n -> i_dont_know env (Step_limit n)
| Satml.Unsat lc -> raise (IUnsat (env, make_explanation lc))
| Ex.Inconsistent (expl, _cls) -> (*may be raised during matching or CS*)
begin
Expand All @@ -1214,6 +1216,7 @@ module Make (Th : Theory.S) : Sat_solver_sig.S = struct
with
| Satml.Unsat lc -> raise (IUnsat (env, make_explanation lc))
| Util.Timeout -> i_dont_know env (Timeout ProofSearch)
| Util.Step_limit_reached n -> i_dont_know env (Step_limit n)
end

let rec unsat_rec_prem env ~first_call : unit =
Expand Down

0 comments on commit bbe2eaa

Please sign in to comment.