Skip to content

Commit cc0aac3

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fixed incorrect type inference for "(array)$null".
2 parents deb7955 + df16fd1 commit cc0aac3

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

Zend/Optimizer/zend_inference.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2491,6 +2491,10 @@ static zend_always_inline int _zend_update_type_info(
24912491
tmp |= MAY_BE_RC1 | MAY_BE_RCN;
24922492
} else {
24932493
tmp |= MAY_BE_RC1;
2494+
if (opline->extended_value == IS_ARRAY
2495+
&& (t1 & (MAY_BE_UNDEF|MAY_BE_NULL))) {
2496+
tmp |= MAY_BE_RCN;
2497+
}
24942498
}
24952499
}
24962500
if (opline->extended_value == IS_ARRAY) {
@@ -2500,7 +2504,7 @@ static zend_always_inline int _zend_update_type_info(
25002504
if (t1 & MAY_BE_OBJECT) {
25012505
tmp |= MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
25022506
} else {
2503-
tmp |= ((t1 & MAY_BE_ANY) << MAY_BE_ARRAY_SHIFT) | ((t1 & MAY_BE_ANY) ? MAY_BE_ARRAY_PACKED : 0);
2507+
tmp |= ((t1 & (MAY_BE_ANY - MAY_BE_NULL)) << MAY_BE_ARRAY_SHIFT) | ((t1 & (MAY_BE_ANY - MAY_BE_NULL)) ? MAY_BE_ARRAY_PACKED : 0);
25042508
}
25052509
}
25062510
UPDATE_SSA_TYPE(tmp, ssa_op->result_def);

ext/opcache/tests/jit/cast_001.phpt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--TEST--
2+
JIT CAST: 001
3+
--INI--
4+
opcache.enable=1
5+
opcache.enable_cli=1
6+
opcache.file_update_protection=0
7+
opcache.jit_buffer_size=1M
8+
opcache.jit=1205
9+
;opcache.jit_debug=1
10+
--EXTENSIONS--
11+
opcache
12+
--FILE--
13+
<?php
14+
function foo (int $x = null) {
15+
$a = (array)$x;
16+
$a[] = 42;
17+
var_dump($a);
18+
}
19+
foo(null);
20+
?>
21+
--EXPECT--
22+
array(1) {
23+
[0]=>
24+
int(42)
25+
}

0 commit comments

Comments
 (0)