Fix GH-16009: Segmentation fault with frameless functions and undefined CVs #16012
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
…fined CVs The frameless function handlers do not update the op variables when handling the result is undefined. In this case this causes propagating an UNDEF value into a temporary, which results in an extra undefined variable warning for a temporary in this case. The original issue also reports a crash in some cases, which is also fixed by this patch.
dstogov
approved these changes
Sep 24, 2024
| @@ -17195,7 +17195,9 @@ static void jit_frameless_icall1(zend_jit_ctx *jit, const zend_op *opline, uint3 | |||
| ir_ref op1_ref = jit_ZVAL_ADDR(jit, op1_addr); | |||
| jit_set_Z_TYPE_INFO(jit, res_addr, IS_NULL); | |||
| if (opline->op1_type == IS_CV && (op1_info & MAY_BE_UNDEF)) { | |||
| zend_jit_zval_check_undef(jit, op1_ref, opline->op1.var, opline, 1); | |||
| op1_ref = zend_jit_zval_check_undef(jit, op1_ref, opline->op1.var, opline, 1); | |||
| op1_info |= MAY_BE_NULL; | |||
There was a problem hiding this comment.
It may make sense to reset MAY_BE_UNDEF flag, but most probably this won't make any difference.
There was a problem hiding this comment.
Right of course, I'll update this and when CI passes merge this.
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 frameless function handlers do not update the op variables when handling the result is undefined. In this case this causes propagating an UNDEF value into a temporary, which results in an extra undefined variable warning for a temporary in this case.
The original issue also reports a crash in some cases, which is also fixed by this patch.
Please note, CI fails on Linux x64 right now but is unrelated