Skip to content

Commit e10d2c2

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Fix type inference
2 parents d8c6549 + 95befc7 commit e10d2c2

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

Zend/Optimizer/zend_inference.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,6 +1976,9 @@ static uint32_t assign_dim_array_result_type(
19761976
tmp |= MAY_BE_ARRAY_KEY_STRING;
19771977
if (dim_op_type != IS_CONST) {
19781978
// FIXME: numeric string
1979+
if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
1980+
tmp |= MAY_BE_ARRAY_PACKED;
1981+
}
19791982
tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
19801983
}
19811984
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--TEST--
2+
Type inference 015: ASSIGN_DIM_OP
3+
--INI--
4+
opcache.enable=1
5+
opcache.enable_cli=1
6+
opcache.optimization_level=-1
7+
--FILE--
8+
<?php
9+
function test() {
10+
for(;;) {
11+
$x[y.y] &= y;
12+
$x = false;
13+
$x[""] = y;
14+
}
15+
}
16+
?>
17+
DONE
18+
--EXPECT--
19+
DONE

0 commit comments

Comments
 (0)