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

Merge branch 'PHP-8.1'

Browse Source 
* PHP-8.1:
  Fix inference for assignment of known object to reference
This commit is contained in:
Nikita Popov
2022-04-15 22:15:57 +02:00
parent 3de0ccfe09 3fdb1aa14e
commit 838746bb4b
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/Optimizer/zend_inference.c
View File

@@ -2809,7 +2809,11 @@ static zend_always_inline zend_result _zend_update_type_info(
tmp |= MAY_BE_DOUBLE;
}
UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
COPY_SSA_OBJ_TYPE(ssa_op->op2_use, ssa_op->op1_def);
if (tmp & MAY_BE_REF) {
UPDATE_SSA_OBJ_TYPE(NULL, 0, ssa_op->op1_def);
} else {
COPY_SSA_OBJ_TYPE(ssa_op->op2_use, ssa_op->op1_def);
}
}
if (ssa_op->result_def >= 0) {
if (tmp & MAY_BE_REF) {

21
Zend/tests/assign_obj_to_ref_inference.phpt Normal file
View File

@@ -0,0 +1,21 @@
--TEST--
Assigning an object of known type to a reference variable
--FILE--
<?php
class Test {
public int $x = 42;
}
function test() {
$r =& $o;
$o = new Test;
$r = new stdClass;
$r->x = 3.141;
var_dump(is_float($o->x));
}
test();
?>
--EXPECT--
bool(true)