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

Merge branch 'PHP-8.0' into PHP-8.1

Browse Source 
* PHP-8.0:
  JIT: Fix incorrect reference counting inference
This commit is contained in:
Dmitry Stogov
2021-11-30 13:00:04 +03:00
parent 005d5f4df8 c1036194d6
commit 3564001502
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/Optimizer/zend_inference.c
View File

@@ -2635,6 +2635,9 @@ static zend_always_inline int _zend_update_type_info(
} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP) {
/* Nothing to do */
} else {
if (opline->opcode == ZEND_ASSIGN_OP && ssa_op->result_def >= 0 && (tmp & MAY_BE_RC1)) {
tmp |= MAY_BE_RCN;
}
UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
}
if (ssa_op->result_def >= 0) {

22
ext/opcache/tests/jit/assign_op_007.phpt Normal file
View File

@@ -0,0 +1,22 @@
--TEST--
JIT ASSIGN_OP: 007 Arrays merging with return value
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
--FILE--
<?php
function test() {
$a = [];
for ($i=0; $i < 2; $i++) {
$a += $a + $a += $a;
$a['b'] += 1;
}
}
test();
?>
DONE
--EXPECTF--
Warning: Undefined array key "b" in %sassign_op_007.php on line 6
DONE