Skip to content

Commit 037d6d0

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fixed GH-12511: Use must be in next opline assertion with patched infection
2 parents b7c34b7 + 586b2f8 commit 037d6d0

File tree

2 files changed

+31
-3
lines changed

2 files changed

+31
-3
lines changed

Zend/Optimizer/zend_inference.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3583,10 +3583,18 @@ static zend_always_inline zend_result _zend_update_type_info(
35833583
uint8_t opcode;
35843584

35853585
if (!ssa_opcodes) {
3586-
ZEND_ASSERT(j == (opline - op_array->opcodes) + 1 && "Use must be in next opline");
3586+
if (j != (opline - op_array->opcodes) + 1) {
3587+
/* Use must be in next opline */
3588+
tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
3589+
break;
3590+
}
35873591
opcode = op_array->opcodes[j].opcode;
35883592
} else {
3589-
ZEND_ASSERT(ssa_opcodes[j] == opline + 1 && "Use must be in next opline");
3593+
if (ssa_opcodes[j] != opline + 1) {
3594+
/* Use must be in next opline */
3595+
tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
3596+
break;
3597+
}
35903598
opcode = ssa_opcodes[j]->opcode;
35913599
}
35923600
switch (opcode) {
@@ -3648,7 +3656,10 @@ static zend_always_inline zend_result _zend_update_type_info(
36483656
EMPTY_SWITCH_DEFAULT_CASE()
36493657
}
36503658
j = zend_ssa_next_use(ssa->ops, ssa_op->result_def, j);
3651-
ZEND_ASSERT(j < 0 && "There should only be one use");
3659+
if (j >= 0) {
3660+
tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
3661+
break;
3662+
}
36523663
}
36533664
}
36543665
if (((tmp & MAY_BE_ARRAY) && (tmp & MAY_BE_ARRAY_KEY_ANY))
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--TEST--
2+
Type inference 022: FETCH_DIM_W
3+
--INI--
4+
opcache.enable=1
5+
opcache.enable_cli=1
6+
opcache.optimization_level=-1
7+
--FILE--
8+
<?php
9+
function &foo(&$a, $n) {
10+
foreach (array(0) as $_) {
11+
return $a[$n];
12+
}
13+
}
14+
?>
15+
DONE
16+
--EXPECT--
17+
DONE

0 commit comments

Comments
 (0)