archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  Fix type inference for FETCH_DI_UNSET
This commit is contained in:
Dmitry Stogov 2022-07-18 13:15:12 +03:00
commit 26d890e6ba
2 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Zend/Optimizer/zend_inference.c
View file

@ -3377,7 +3377,12 @@ static zend_always_inline zend_result _zend_update_type_info(
ZEND_ASSERT(j < 0 && "There should only be one use"); ZEND_ASSERT(j < 0 && "There should only be one use");
} }
} }
if (((tmp & MAY_BE_ARRAY) && (tmp & MAY_BE_ARRAY_KEY_ANY)) || opline->opcode == ZEND_FETCH_DIM_FUNC_ARG) { if (((tmp & MAY_BE_ARRAY) && (tmp & MAY_BE_ARRAY_KEY_ANY))
|| opline->opcode == ZEND_FETCH_DIM_FUNC_ARG
|| opline->opcode == ZEND_FETCH_DIM_R
|| opline->opcode == ZEND_FETCH_DIM_IS
|| opline->opcode == ZEND_FETCH_DIM_UNSET
|| opline->opcode == ZEND_FETCH_LIST_R) {
UPDATE_SSA_TYPE(tmp, ssa_op->op1_def); UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
} else { } else {
/* invalid key type */ /* invalid key type */

26
ext/opcache/tests/opt/inference_012.phpt Normal file
View file

@ -0,0 +1,26 @@
--TEST--
Type inference 012: FETCH_DIM_UNSET
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.optimization_level=-1
--FILE--
<?php
function test() {
$closure = function() {return "string";};
unset($x['b'][$closure()]['d']);
$x = $arr;
$arr = ['a' => $closure(), 'b' => [$closure() => []]];
$x = $arr;
unset($x['b'][$closure()]['d']);
$x = $arr;
}
test();
?>
DONE
--EXPECTF--
Warning: Undefined variable $x in %sinference_012.php on line 4
Warning: Undefined variable $arr in %sinference_012.php on line 5
DONE