Merge branch 'PHP-8.1'

* PHP-8.1:
  Fix type inference
This commit is contained in:
Dmitry Stogov 2022-07-18 14:20:41 +03:00
commit 71814e9d99
2 changed files with 22 additions and 0 deletions

View File

@ -1961,6 +1961,9 @@ static uint32_t assign_dim_array_result_type(
value_type |= MAY_BE_NULL;
}
if (dim_op_type == IS_UNUSED) {
if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
tmp |= MAY_BE_ARRAY_PACKED;
}
tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
} else {
if (dim_type & (MAY_BE_LONG|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_RESOURCE|MAY_BE_DOUBLE)) {

View File

@ -0,0 +1,19 @@
--TEST--
Type inference 013: ASSIGN_DIM
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.optimization_level=-1
--FILE--
<?php
function y(){
for(;;){
$x[] &= y;
$x = false;
$x[""] = y;
}
}
?>
DONE
--EXPECT--
DONE