Skip to content

Commit b3b46a4

Browse files
committed
Fixed GH-12511: Use must be in next opline assertion with patched infection
1 parent abe3673 commit b3b46a4

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
@@ -3312,10 +3312,18 @@ static zend_always_inline int _zend_update_type_info(
33123312
zend_uchar opcode;
33133313

33143314
if (!ssa_opcodes) {
3315-
ZEND_ASSERT(j == (opline - op_array->opcodes) + 1 && "Use must be in next opline");
3315+
if (j != (opline - op_array->opcodes) + 1) {
3316+
/* Use must be in next opline */
3317+
tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
3318+
break;
3319+
}
33163320
opcode = op_array->opcodes[j].opcode;
33173321
} else {
3318-
ZEND_ASSERT(ssa_opcodes[j] == opline + 1 && "Use must be in next opline");
3322+
if (ssa_opcodes[j] != opline + 1) {
3323+
/* Use must be in next opline */
3324+
tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
3325+
break;
3326+
}
33193327
opcode = ssa_opcodes[j]->opcode;
33203328
}
33213329
switch (opcode) {
@@ -3374,7 +3382,10 @@ static zend_always_inline int _zend_update_type_info(
33743382
EMPTY_SWITCH_DEFAULT_CASE()
33753383
}
33763384
j = zend_ssa_next_use(ssa->ops, ssa_op->result_def, j);
3377-
ZEND_ASSERT(j < 0 && "There should only be one use");
3385+
if (j >= 0) {
3386+
tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
3387+
break;
3388+
}
33783389
}
33793390
}
33803391
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)