archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix live range calculation for FE_FETCH

Browse source 
Op2 is def here, not a use, so treat it accordingly.
This commit is contained in:
Nikita Popov 2020-01-30 14:23:46 +01:00
parent 01d30f880a
commit be7eab3202
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Zend/tests/fe_fetch_op2_live_range.phpt Normal file
View file

@ -0,0 +1,12 @@
--TEST--
FE_FETCH op2 is a def and needs special live range handling
--FILE--
<?php
try {
foreach (["test"] as $k => func()[]) {}
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
Call to undefined function func()

12
Zend/zend_opcode.c
View file

@ -817,7 +817,17 @@ static void zend_calc_live_ranges(
}
if (opline->op2_type & (IS_TMP_VAR|IS_VAR)) {
uint32_t var_num = EX_VAR_TO_NUM(opline->op2.var) - var_offset;
if (EXPECTED(last_use[var_num] == (uint32_t) -1)) {
if (UNEXPECTED(opline->opcode == ZEND_FE_FETCH_R
|| opline->opcode == ZEND_FE_FETCH_RW)) {
/* OP2 of FE_FETCH is actually a def, not a use. */
if (last_use[var_num] != (uint32_t) -1) {
if (opnum + 1 != last_use[var_num]) {
emit_live_range(
op_array, var_num, opnum, last_use[var_num], needs_live_range);
}
last_use[var_num] = (uint32_t) -1;
}
} else if (EXPECTED(last_use[var_num] == (uint32_t) -1)) {
#if 1
/* OP_DATA uses only op1 operand */
ZEND_ASSERT(opline->opcode != ZEND_OP_DATA);