Fix GH-17428: Assertion failure ext/opcache/jit/zend_jit_ir.c:8940 #17438
+38
−3
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
The code to update the call_level in that case skips the opline itself, as that's handled by the tail handler, and then wants to set the opline to the last opline of the block because the code below the switch will update the call_level for that opline. However, the test has a block with a single opline (THROW). The block after that has ZEND_INIT_FCALL, because `i` points to ZEND_INIT_FCALL now, it erroneously causes the call_level after the switch. Although it suffices to change `i` to `end` (none of the opcodes here occur in `zend_jit_dec_call_level`), I added a goto label as well to be safer for the future in case the list of opcodes changes.
dstogov
reviewed
Jan 14, 2025
| opline = op_array->opcodes + i; | ||
| if (zend_jit_inc_call_level(opline->opcode)) { | ||
| call_level++; | ||
| } else if (zend_jit_dec_call_level(opline->opcode)) { | ||
| call_level--; | ||
| } | ||
| } | ||
| opline = op_array->opcodes + i; | ||
| break; | ||
| opline = op_array->opcodes + end; |
There was a problem hiding this comment.
May be you should fix only this single line?
- opline = op_array->opcodes + i;
+ opline = op_array->opcodes + end;
dstogov
approved these changes
Jan 14, 2025
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.
The code to update the call_level in that case skips the opline itself, as that opline is handled by the tail handler, and then wants to set the opline to the last opline of the block because the code below the switch will update the call_level for that opline.
However, the test has a block with a single opline (THROW). The block after that has ZEND_INIT_FCALL. Because
ipoints to ZEND_DO_FCALL now, it erroneously updates the call_level after the switch. Although it suffices to changeitoend(none of the opcodes here occur inzend_jit_dec_call_level), I added a goto label and changed the loop to handle all call_level updates. This seems more robust for the future in case the list of opcodes changes.