Browse Source

Merge branch 'PHP-7.0'

Conflicts:
	ext/opcache/Optimizer/block_pass.c
pull/1893/head
Nikita Popov 10 years ago
parent
commit
35e7573a33
  1. 4
      ext/opcache/Optimizer/block_pass.c

4
ext/opcache/Optimizer/block_pass.c

@ -1189,9 +1189,9 @@ next_target:
same_type == ZEND_OP1_TYPE(target) &&
same_var == VAR_NUM_EX(target->op1) &&
!(target_block->flags & ZEND_BB_PROTECTED)) {
/* JMPZ(X, L), L: X = JMPNZ_EX(X, L2) -> JMPZ(X, L+1) */
/* JMPZ(X, L), L: T = JMPNZ_EX(X, L2) -> T = JMPZ_EX(X, L+1) */
last_op->opcode += 3;
last_op->result = target->result;
COPY_NODE(last_op->result, target->result);
DEL_SOURCE(block, block->successors[0]);
block->successors[0] = target_block->successors[1];
ADD_SOURCE(block, block->successors[0]);

Loading…
Cancel
Save