Commit 2de8cf92857 for php
commit 2de8cf9285712a17a5fc0f8034e7ed10fc55067a
Merge: 6a74b16d272 102a693de2c
Author: Weilin Du <weilindu@php.net>
Date: Sun Oct 25 01:50:53 2026 +0800
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
JIT: Fix operand type check in zend_redo_pass_two_ex() (#24658)
diff --cc Zend/Optimizer/zend_optimizer.c
index 6d5b5f541a9,5fd851ab153..4b2e12d9ebf
--- a/Zend/Optimizer/zend_optimizer.c
+++ b/Zend/Optimizer/zend_optimizer.c
@@@ -1343,9 -1337,9 +1343,9 @@@ static void zend_redo_pass_two_ex(zend_
opline = op_array->opcodes;
end = opline + op_array->last;
while (opline < end) {
- zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
+ const zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
uint32_t op1_info = opline->op1_type == IS_UNUSED ? 0 : (OP1_INFO() & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_KEY_ANY));
- uint32_t op2_info = opline->op1_type == IS_UNUSED ? 0 : (OP2_INFO() & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_KEY_ANY));
+ uint32_t op2_info = opline->op2_type == IS_UNUSED ? 0 : (OP2_INFO() & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_KEY_ANY));
uint32_t res_info =
(opline->opcode == ZEND_PRE_INC ||
opline->opcode == ZEND_PRE_DEC ||