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

Make PRE_INC/PRE_DEC type inference more accurate

Browse Source 
The return value can never be a reference, even if the variable
is a reference.

While here, also exclude the resource and array types which throw
a TypeError since PHP 8.0.
This commit is contained in:
Nikita Popov
2021-06-09 15:15:23 +02:00
parent b58d74547f
commit cbe485db05
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Zend/Optimizer/zend_inference.c
View File

@@ -2631,9 +2631,6 @@ static zend_always_inline int _zend_update_type_info(
case ZEND_PRE_INC:
case ZEND_PRE_DEC:
tmp = 0;
if (t1 & MAY_BE_REF) {
tmp |= MAY_BE_REF;
}
if (t1 & (MAY_BE_RC1|MAY_BE_RCN)) {
tmp |= MAY_BE_RC1;
if (ssa_op->result_def >= 0) {
@@ -2670,14 +2667,17 @@ static zend_always_inline int _zend_update_type_info(
if (t1 & MAY_BE_STRING) {
tmp |= MAY_BE_STRING | MAY_BE_LONG | MAY_BE_DOUBLE;
}
tmp |= t1 & (MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE | MAY_BE_ARRAY | MAY_BE_OBJECT | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_KEY_ANY);
}
if (ssa_op->op1_def >= 0) {
UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
tmp |= t1 & (MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_OBJECT);
}
if (ssa_op->result_def >= 0) {
UPDATE_SSA_TYPE(tmp, ssa_op->result_def);
}
if (ssa_op->op1_def >= 0) {
if (t1 & MAY_BE_REF) {
tmp |= MAY_BE_REF;
}
UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
}
break;
case ZEND_POST_INC:
case ZEND_POST_DEC: