Skip to content

Fix recursion check in direct style interpreter #368

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.

Sign up for GitHub

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 1 commit into from
May 28, 2025
Merged

Fix recursion check in direct style interpreter #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions pact-repl/Pact/Core/IR/Eval/Direct/Evaluator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,13 +649,15 @@ sysOnlyEnv e

evalWithStackFrame :: i -> StackFrame i -> Maybe Type -> EvalM e b i (EvalValue e b i) -> EvalM e b i (EvalValue e b i)
evalWithStackFrame info sf mty act = do
checkRecursion
esStack %= (sf:)
#ifdef WITH_FUNCALL_TRACING
timeEnter <- liftIO $ getTime ProcessCPUTime
esTraceOutput %= (TraceFunctionEnter timeEnter sf info:)
#endif
v <- act
esStack %= safeTail
esCheckRecursion %= getPrevRecCheck
pv <- enforcePactValue info v
rtcEnabled <- isExecutionFlagSet FlagDisableRuntimeRTC
unless rtcEnabled $ maybeTCType info mty pv
Expand All @@ -664,6 +666,16 @@ evalWithStackFrame info sf mty act = do
esTraceOutput %= (TraceFunctionExit timeExit sf info:)
#endif
return (VPactValue pv)
where
checkRecursion = do
RecursionCheck currentCalled <- uses esCheckRecursion NE.head
let qn = fqnToQualName (_sfName sf)
when (S.member qn currentCalled) $ throwExecutionError info (RuntimeRecursionDetected qn)
esCheckRecursion %= NE.cons (RecursionCheck (S.insert qn currentCalled))
getPrevRecCheck (_ :| l) = case l of
top : rest -> top :| rest
[] -> (RecursionCheck mempty) :| []

{-# INLINE evalWithStackFrame #-}

applyLamUnsafe
Expand Down
4 changes: 2 additions & 2 deletions pact-tests/pact-tests/modref-recursion.repl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
)

(env-gasmodel "table")
(env-gaslimit 10) ; ensures test does not run forever in case recursion breaks
(env-gaslimit 1000) ; ensures test does not run forever in case recursion breaks


(expect-failure "Recursion should fail @ runtime" (knot2.callF knot1))
(expect-failure "Recursion should fail @ runtime" "Recursion detected by the runtime. Recursing in function: knot2.callF" (knot2.callF knot1))