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

Merge branch 'PHP-8.1' into PHP-8.2

Browse source 
* PHP-8.1:
  Revert "Fix GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT"
This commit is contained in:
Niels Dossche 2023-09-30 01:27:06 +02:00
commit 0f5b382528
3 changed files with 9 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -8,8 +8,6 @@ PHP NEWS
. Fixed bug GH-12215 (Module entry being overwritten causes type errors in
ext/dom). (nielsdos)
. Fixed bug GH-12273 (__builtin_cpu_init check). (Freaky)
. Fixed bug GH-10008 (Narrowing occurred during type inference of
ZEND_ADD_ARRAY_ELEMENT). (nielsdos, arnaud-lb)
- CType:
. Fixed bug GH-11997 (ctype_alnum 5 times slower in PHP 8.1 or greater).

30
Zend/Optimizer/zend_inference.c
View file

@ -1942,21 +1942,6 @@ ZEND_API uint32_t zend_array_element_type(uint32_t t1, zend_uchar op_type, int w
return tmp;
}
static zend_always_inline uint32_t assign_long_dim_array_result_type(uint32_t arr_type)
{
/* Rules:
* HASH_ONLY -> MAY_BE_ARRAY_NUMERIC_HASH
* PACKED_ONLY -> MAY_BE_ARRAY_NUMERIC_HASH | MAY_BE_ARRAY_PACKED (== MAY_BE_ARRAY_KEY_LONG)
* HASH || PACKED -> MAY_BE_ARRAY_NUMERIC_HASH | MAY_BE_ARRAY_PACKED (== MAY_BE_ARRAY_KEY_LONG)
* 0 -> MAY_BE_ARRAY_NUMERIC_HASH
*/
if (MAY_BE_PACKED(arr_type)) {
return MAY_BE_ARRAY_KEY_LONG;
} else {
return MAY_BE_ARRAY_NUMERIC_HASH;
}
}
static uint32_t assign_dim_array_result_type(
uint32_t arr_type, uint32_t dim_type, uint32_t value_type, zend_uchar dim_op_type) {
uint32_t tmp = 0;
@ -1970,13 +1955,13 @@ static uint32_t assign_dim_array_result_type(
if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
tmp |= MAY_BE_ARRAY_PACKED;
}
tmp |= assign_long_dim_array_result_type(arr_type);
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)) {
if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
tmp |= MAY_BE_ARRAY_PACKED;
}
tmp |= assign_long_dim_array_result_type(arr_type);
tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
}
if (dim_type & MAY_BE_STRING) {
tmp |= MAY_BE_ARRAY_KEY_STRING;
@ -1985,7 +1970,7 @@ static uint32_t assign_dim_array_result_type(
if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
tmp |= MAY_BE_ARRAY_PACKED;
}
tmp |= assign_long_dim_array_result_type(arr_type);
tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
}
}
if (dim_type & (MAY_BE_UNDEF|MAY_BE_NULL)) {
@ -3301,7 +3286,8 @@ static zend_always_inline zend_result _zend_update_type_info(
key_type |= MAY_BE_ARRAY_PACKED;
}
if (t1 & MAY_BE_ARRAY) {
key_type |= assign_long_dim_array_result_type(t1);
key_type |= MAY_BE_HASH_ONLY(t1) ?
MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
}
} else {
if (t2 & (MAY_BE_LONG|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_RESOURCE|MAY_BE_DOUBLE)) {
@ -3309,7 +3295,8 @@ static zend_always_inline zend_result _zend_update_type_info(
key_type |= MAY_BE_ARRAY_PACKED;
}
if (t1 & MAY_BE_ARRAY) {
key_type |= assign_long_dim_array_result_type(t1);
key_type |= MAY_BE_HASH_ONLY(t1) ?
MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
}
}
if (t2 & MAY_BE_STRING) {
@ -3320,7 +3307,8 @@ static zend_always_inline zend_result _zend_update_type_info(
key_type |= MAY_BE_ARRAY_PACKED;
}
if (t1 & MAY_BE_ARRAY) {
key_type |= assign_long_dim_array_result_type(t1);
key_type |= MAY_BE_HASH_ONLY(t1) ?
MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
}
}
}

30
ext/opcache/tests/opt/gh10008.phpt
View file

@ -1,30 +0,0 @@
--TEST--
GH-10008 (Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT)
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.optimization_level=0x20
--EXTENSIONS--
opcache
--FILE--
<?php
function test()
{
$bool = true;
for ($i = 0; $i < 10; $i++) {
if ($bool !== true) {
$string_key = "a";
// The following line triggers narrowing during type inference of ZEND_ADD_ARRAY_ELEMENT.
$array = ["b" => $bool, $string_key => 123];
}
$bool = false;
}
}
echo "Done\n";
?>
--EXPECT--
Done