🐛 make sure to propagate unwind outside scoped#1186
Merged
Conversation
commit: |
cowboyd
force-pushed
the
dont-swallow-scope-unwind
branch
2 times, most recently
from
a4d3417 to
86c2842
Compare
Fixes #1185. If a routine was halted while suspended inside scoped(), code after yield* scoped(...) would still run. iter.return() yielded the destroy() effects in scoped's finally, but the resume came back as iter.next() — which takes the frame out of return-mode. trap() re-arms via trap.exit(); scoped() had no equivalent. Pre-d3266784 the Delimiter handled this with a sticky "cancelling" state; the unify refactor lost it. Fix: inline the Trap, run destroy() in critical() so cleanup completes, then yield trap.exit() to re-arm unwind based on the inner trap's outcome.
cowboyd
force-pushed
the
dont-swallow-scope-unwind
branch
from
86c2842 to
5779c0b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
Fix #1185.
If a routine was halted while suspended inside scoped(), code after yield* scoped(...) would still run.
iter.return() yielded the destroy() effects in scoped's finally, but the resume came back as iter.next() which takes the frame out of return-mode. trap() re-arms via trap.exit(); scoped() had no equivalent.
Fix: inline the Trap, run destroy() in critical() so cleanup completes, then yield trap.exit() to re-arm unwind based on the inner trap's outcome.