Fix GH-16770: Tracing JIT type mismatch when returning UNDEF #16784
Conversation
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
When returning an UNDEF value, it actually becomes NULL. The following code took this into account: https://github.com/php/php-src/blob/28344e0445bc2abae8dc5f1376aa0ff350e6d66d/ext/opcache/jit/zend_jit_trace.c#L2196-L2199 But the stack does not update the type to NULL, causing a mismatch.
|
I'm not sure if updating the abstract stack types is enough, or if this may cause issues with JIT codegen (e.g. do we need codegen to actually change the type info of the zval or is this already handled?). |
dstogov
approved these changes
Nov 14, 2024
There was a problem hiding this comment.
The fix is right, but I would move this check into ZEND_RETURN handler.
case ZEND_RETURN:
op1_info = OP1_INFO();
CHECK_OP1_TRACE_TYPE();
if (opline->op1_type == IS_CONST) {
res_type = Z_TYPE_P(RT_CONSTANT(opline, opline->op1));
} else if (op1_type != IS_UNKNOWN) {
res_type = op1_type;
+ if (res_type == IS_UNDEF) {
+ res_type = IS_NULL;
+ }
}
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.
When returning an UNDEF value, it actually becomes NULL. The following code took this into account:
php-src/ext/opcache/jit/zend_jit_trace.c
Lines 2196 to 2199 in 28344e0
But the stack does not update the type to NULL, causing a mismatch.
Alternative would be to update the code I quoted above I think.