mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-10 04:54:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix another bug in coalesce elimination

Browse Source
This commit is contained in:
Nikita Popov 2018-02-17 12:59:25 +01:00
parent b2cd274122
commit ef10dfc31d
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ext/opcache/Optimizer/dfa_pass.c
View File

@ -810,28 +810,30 @@ optimize_jmpnz:
}
break;
case ZEND_COALESCE:
if (opline->op1_type == IS_CONST) {
{
zend_ssa_var *var = &ssa->vars[ssa_op->result_def];
if (opline->op1_type == IS_CONST
&& var->use_chain < 0 && var->phi_use_chain == NULL) {
if (Z_TYPE_P(CT_CONSTANT_EX(op_array, opline->op1.constant)) == IS_NULL) {
zend_ssa_remove_result_def(ssa, ssa_op);
MAKE_NOP(opline);
removed_ops++;
take_successor_1(ssa, block_num, block);
goto optimize_nop;
} else {
zend_ssa_var *var = &ssa->vars[ssa_op->result_def];
if (var->use_chain < 0 && var->phi_use_chain == NULL) {
if (opline->result_type & (IS_TMP_VAR|IS_VAR)) {
zend_optimizer_remove_live_range_ex(op_array, opline->result.var, var->definition);
}
opline->opcode = ZEND_JMP;
opline->result_type = IS_UNUSED;
zend_ssa_remove_result_def(ssa, ssa_op);
COPY_NODE(opline->op1, opline->op2);
take_successor_0(ssa, block_num, block);
goto optimize_jmp;
if (opline->result_type & (IS_TMP_VAR|IS_VAR)) {
zend_optimizer_remove_live_range_ex(op_array, opline->result.var, var->definition);
}
opline->opcode = ZEND_JMP;
opline->result_type = IS_UNUSED;
zend_ssa_remove_result_def(ssa, ssa_op);
COPY_NODE(opline->op1, opline->op2);
take_successor_0(ssa, block_num, block);
goto optimize_jmp;
}
}
break;
}
case ZEND_NOP:
optimize_nop:
compress_block(op_array, block);

7
ext/opcache/tests/jmp_elim_004.phpt
View File

@ -9,9 +9,16 @@ opcache.optimization_level=-1
function test() {
$foo = "test";
var_dump($foo ?? "default");
$null = null;
var_dump($null ?? 3);
var_dump($null ?? new stdClass);
}
test();
?>
--EXPECT--
string(4) "test"
int(3)
object(stdClass)#1 (0) {
}