Fix GH-17307: Internal closure causes JIT failure #17319
Closed
Conversation
This file contains 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
`bcadd(...)` is a closure for an internal function, and `zend_jit_push_call_frame` takes into account both last_var and the difference in argument numbers not only for user code but also for internal code. However, this is inconsistent with `zend_vm_calc_used_stack`, causing argument corruption. Making this consistent fixes the issue. I could only reproduce the assertion failure when using Valgrind.
dstogov
approved these changes
Jan 9, 2025
nielsdos
added a commit
to nielsdos/php-src
that referenced
this pull request
Jan 9, 2025
This is a backport of phpGH-17319 to fix phpGH-17307 on lower branches.
Closed
nielsdos
added a commit
to nielsdos/php-src
that referenced
this pull request
Jan 9, 2025
This is a backport of phpGH-17319 to fix phpGH-17307 on lower branches.
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.
bcadd(...)is a closure for an internal function, andzend_jit_push_call_frametakes into account both last_var and the difference in argument numbers not only for user code but also for internal code. However, this is inconsistent withzend_vm_calc_used_stack, causing argument corruption. Making this consistent fixes the issue.I could only reproduce the assertion failure when using Valgrind.
This needs a backport to 8.3, which I can do if this is right.