clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert ASSIGN_ADD $cv, int(1) into PRE_INC $cv, if it's safe.

Browse Source
This commit is contained in:
Dmitry Stogov 2016-03-22 22:50:43 +03:00
parent fa6ce55675
commit 94812fa6cd
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,8 +329,11 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
for (i = 0; i < ssa->vars_count; i++) { for (i = 0; i < ssa->vars_count; i++) {
int op2 = ssa->vars[i].definition; int op2 = ssa->vars[i].definition;
if (op2 >= 0 if (op2 < 0) {
&& op_array->opcodes[op2].opcode == ZEND_ASSIGN continue;
}
if (op_array->opcodes[op2].opcode == ZEND_ASSIGN
&& op_array->opcodes[op2].op1_type == IS_CV && op_array->opcodes[op2].op1_type == IS_CV
&& !RETURN_VALUE_USED(&op_array->opcodes[op2]) && !RETURN_VALUE_USED(&op_array->opcodes[op2])
) { ) {
@ -403,6 +406,31 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
} }
} }
} }
} else if (op_array->opcodes[op2].opcode == ZEND_ASSIGN_ADD
&& op_array->opcodes[op2].extended_value == 0
&& ssa->ops[op2].op1_def == i
&& op_array->opcodes[op2].op2_type == IS_CONST
&& Z_TYPE_P(CT_CONSTANT_EX(op_array, op_array->opcodes[op2].op2.constant)) == IS_LONG
&& Z_LVAL_P(CT_CONSTANT_EX(op_array, op_array->opcodes[op2].op2.constant)) == 1
&& ssa->ops[op2].op1_use >= 0
&& !(ssa->var_info[ssa->ops[op2].op1_use].type & (MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) {
op_array->opcodes[op2].opcode = ZEND_PRE_INC;
SET_UNUSED(op_array->opcodes[op2].op2);
} else if (op_array->opcodes[op2].opcode == ZEND_ASSIGN_SUB
&& op_array->opcodes[op2].extended_value == 0
&& ssa->ops[op2].op1_def == i
&& op_array->opcodes[op2].op2_type == IS_CONST
&& Z_TYPE_P(CT_CONSTANT_EX(op_array, op_array->opcodes[op2].op2.constant)) == IS_LONG
&& Z_LVAL_P(CT_CONSTANT_EX(op_array, op_array->opcodes[op2].op2.constant)) == 1
&& ssa->ops[op2].op1_use >= 0
&& !(ssa->var_info[ssa->ops[op2].op1_use].type & (MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) {
op_array->opcodes[op2].opcode = ZEND_PRE_DEC;
SET_UNUSED(op_array->opcodes[op2].op2);
} }
} }
if (remove_nops) { if (remove_nops) {