fix(vm): try/finally execution — return defers through finally (#3082)#3106
Merged
Conversation
Defer TYPE_RETURN through pending-finally handlers (nested try supported), mark finally complete when leaving the finally CFG block, and add compliance tests for normal, catch+throw, and return paths. php-src: Zend/zend_exceptions.c (zend_execute_finally) Co-authored-by: Cursor <cursoragent@cursor.com>
7829782 to
8326138
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
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.
Summary
Closes #3082.
return/return $vinsidetrynow runs pendingfinallyhandlers first (including nested try), matching Zend unwind semantics.returndoes not re-run finally.php-src reference
Zend/zend_exceptions.c—zend_execute_finally()Zend/zend_compile.c— try/finally CFGVerification
JIT follow-up remains in #2114.
Made with Cursor