Fix GH-14873: PHP 8.4 min function fails on typed integer #14903
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
The problem is that this line in the VM: `ZVAL_NULL(result);` changes the type of arg1 as well, because after the DFA pass the result and input both use CV0($result). We should not contract assignments with CVs in frameless calls with arguments. An older attempt is found at phpGH-14876 that tried to modify the VM/JIT.
iluuu1994
reviewed
Jul 10, 2024
Zend/Optimizer/dfa_pass.c
Outdated
| @@ -325,6 +325,11 @@ static bool opline_supports_assign_contraction( | |||
| return 0; | |||
| } | |||
|
|
|||
| if (opline->opcode >= ZEND_FRAMELESS_ICALL_1 && opline->opcode <= ZEND_FRAMELESS_ICALL_3) { | |||
| /* Frameless calls override the return value, but the return value may overlap with the arguments. */ | |||
| return opline->op1_type != IS_CV || opline->op1.var != cv_var; | |||
There was a problem hiding this comment.
Can the exact same issue not arise with op2? I.e.
CV0($value) = FRAMELESS_ICALL_2(min) int(100) CV0($value)
Clearing result would clear op2.
Same with OP_DATA for ZEND_FRAMELESS_ICALL_3.
There was a problem hiding this comment.
Yes indeed, I don't know why I missed this sorry
nielsdos
force-pushed
the
fix-14873-2
branch
2 times, most recently
from
cefb129 to
0cf179e
Compare
iluuu1994
approved these changes
Jul 12, 2024
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 problem is that this line in the VM:
ZVAL_NULL(result);changes the type of arg1 as well, because after the DFA pass the result and input both use CV0($result).We should not contract assignments with CVs in frameless calls with arguments.
An older attempt is found at GH-14876 that tried to modify the VM/JIT.