Skip to content

HOTFIX more comments and error handling in constraint pre-evaluation #4105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions booster/library/Booster/Pattern/Rewrite.hs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import Data.Map qualified as Map
import Data.Maybe (catMaybes, fromMaybe)
import Data.Sequence as Seq (Seq, fromList, (|>))
import Data.Set qualified as Set
import Data.Text as Text (Text, pack)
import Data.Text as Text (Text, pack, unpack)
import Numeric.Natural
import Prettyprinter

Expand Down Expand Up @@ -1001,16 +1001,32 @@ performRewrite ::
Pattern ->
io (Natural, Seq (RewriteTrace ()), RewriteResult Pattern)
performRewrite rewriteConfig pat = do
-- simplify all constraints (individually) before starting to rewrite
simplifiedConstraints <-
withContext CtxSimplify $ evaluateConstraints definition llvmApi smtSolver pat.constraints
case simplifiedConstraints of
Right constraints ->
(flip runStateT rewriteStart $ doSteps False pat{constraints})
>>= \(rr, RewriteStepsState{counter, traces}) -> pure (counter, traces, rr)
Left r@(SideConditionFalse{}) ->
pure (0, fromList [RewriteSimplified (Just r)], error "Just return #Bottom here")
Left err ->
error (show err)
(rr, RewriteStepsState{counter, traces}) <-
case simplifiedConstraints of
Right constraints ->
flip runStateT rewriteStart $ doSteps False pat{constraints}
Left r@SideConditionFalse{} ->
-- a side condition was found to be false, return a vacuous state
pure (RewriteTrivial pat, rewriteStart{traces = Seq.fromList [RewriteSimplified (Just r)]})
Left (InternalError msg) -> do
-- fail hard on internal errors
withContext CtxSimplify $ withContext CtxError $ logMessage msg
error $ Text.unpack msg
Left err -> do
-- log but ignore other actual errors (IndexIsNone,
-- TooManyIterations, EquationLoop, TooManyRecursions,
-- EquationLoop, UndefinedTerm), proceeding with the
-- original constraints (to fail later when processing
-- the constraints during rewriting or at the end).
getPrettyModifiers >>= \case
ModifiersRep (_ :: FromModifiersT mods => Proxy mods) ->
withContext CtxSimplify . withContext CtxWarn . logMessage $
renderOneLineText (pretty' @mods err)
flip runStateT rewriteStart $ doSteps False pat
pure (counter, traces, rr)
where
RewriteConfig
{ definition
Expand Down
Loading