mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 12:54:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Backport narrowing fix to 7.1

Browse Source 
This is a cherry-pick of 8a4532319d.
This commit is contained in:
Nikita Popov 2017-12-16 21:11:40 +01:00
parent 6da44fefb2
commit f208187773
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/opcache/Optimizer/zend_inference.c
View File

@ -2157,6 +2157,24 @@ static int zend_update_type_info(const zend_op_array *op_array,
t1 = OP1_INFO();
t2 = OP2_INFO();
/* If one of the operands cannot have any type, this means the operand derives from
* unreachable code. Propagate the empty result early, so that that the following
* code may assume that operands have at least one type. */
if (!(t1 & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_CLASS|MAY_BE_ERROR))
|| !(t2 & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_CLASS|MAY_BE_ERROR))) {
tmp = 0;
if (ssa_ops[i].result_def >= 0) {
UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def);
}
if (ssa_ops[i].op1_def >= 0) {
UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def);
}
if (ssa_ops[i].op2_def >= 0) {
UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def);
}
return 1;
}
switch (opline->opcode) {
case ZEND_ADD:
case ZEND_SUB: