Fix AOT try/catch for empty user classes (#2157) - #2181
Merged
Conversation
Skip CFG jumps when collecting catch arms, wire merge entry/body before dispatch, compile catch at the match basic block, and reuse declared class ids so 007-ThrowsWeb AOT execute reaches the caught invalid path. Co-authored-by: Cursor <cursoragent@cursor.com>
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
TryCatchHelper::collectCatchOps()to skipTYPE_JUMPopcodes betweenTYPE_TRYandTYPE_CATCHso nested CFG (e.g.007-ThrowsWeb) registers catch arms instead of falling through toabort().compileIncludedAtEntry()at the match BB so catch bodies (echo/assign) are reachable in native AOT.declareClass()and addthrows_user_classAOT fixture plusTryCatchCollectOpsTest.Test plan
vendor/bin/phpunit --filter throws_user_classTHROWSWEB_AOT_SMOKE_GATE=1 vendor/bin/phpunit test/unit/ThrowsWebAotExecuteTest.php./phpc build --project examples/007-ThrowsWeb+ POSTemail=badprintsinvalidbin/jit.phptry/catch execute still segfaults on master and this branch (AOT/native path is green).Closes #2157
Made with Cursor