diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-04-10 22:09:34 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-04-10 22:09:34 +0200 |
| commit | 6f950e83eb1467521853d6628f514d2eebef7ebb (patch) | |
| tree | f71a1e1663637eb7d2035c5ee0c55815d815cff4 | |
| parent | 8c53c346d45f7623d542b62b1622d6c7a8bf7c42 (diff) | |
| download | php-git-6f950e83eb1467521853d6628f514d2eebef7ebb.tar.gz | |
Fix JMPZ+JMP => NOP+JMP optimization
| -rw-r--r-- | ext/opcache/Optimizer/block_pass.c | 4 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/pass2.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index 413b8b10e2..acce8b70d0 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -1462,7 +1462,9 @@ static void zend_jmp_optimization(zend_code_block *block, zend_op_array *op_arra break; } } - if (last_op->op1_type & (IS_VAR|IS_TMP_VAR)) { + if (last_op->op1_type == IS_CV) { + break; + } else if (last_op->op1_type & (IS_VAR|IS_TMP_VAR)) { last_op->opcode = ZEND_FREE; last_op->op2.num = 0; block->op2_to = NULL; diff --git a/ext/opcache/Optimizer/pass2.c b/ext/opcache/Optimizer/pass2.c index 4abaa30fbc..098be5146b 100644 --- a/ext/opcache/Optimizer/pass2.c +++ b/ext/opcache/Optimizer/pass2.c @@ -156,7 +156,14 @@ void zend_optimizer_pass2(zend_op_array *op_array) /* JMPNZ(X, L1), JMP(L2) => JMPZNZ(X, L2, L1) */ if (ZEND_OP2(opline).opline_num == ZEND_OP1(opline + 1).opline_num) { /* JMPZ(X, L1), JMP(L1) => NOP, JMP(L1) */ - MAKE_NOP(opline); + if (opline->op1_type == IS_CV) { + break; + } else if (opline->op1_type & (IS_TMP_VAR|IS_VAR)) { + opline->opcode = ZEND_FREE; + opline->op2.num = 0; + } else { + MAKE_NOP(opline); + } } else { if (opline->opcode == ZEND_JMPZ) { opline->extended_value = ZEND_OP1(opline + 1).opline_num; |