php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-08 08:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1'

Browse Source 
* PHP-8.1:
  Fix type inference
This commit is contained in:
Dmitry Stogov
2022-08-22 21:12:49 +03:00
parent d8c6549974 95befc786a
commit e10d2c2bf9
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/Optimizer/zend_inference.c
View File

@@ -1976,6 +1976,9 @@ static uint32_t assign_dim_array_result_type(
tmp |= MAY_BE_ARRAY_KEY_STRING;
if (dim_op_type != IS_CONST) {
// FIXME: numeric string
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;
}
}

19
ext/opcache/tests/opt/inference_015.phpt Normal file
View File

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