diff options
| author | Nikita Popov <nikic@php.net> | 2016-05-05 00:01:56 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-05-05 00:01:56 +0200 |
| commit | 35e7573a338c28d41c2c0228e58a4dff373f783b (patch) | |
| tree | 62c582ba357d8787f06e16d003b99381c6834781 | |
| parent | 172d8552fc2ddb4e70a03f463f695de174aacf5c (diff) | |
| parent | 0691e7a8e15ace3ce186ceb8c27753325a5a956f (diff) | |
| download | php-git-35e7573a338c28d41c2c0228e58a4dff373f783b.tar.gz | |
Merge branch 'PHP-7.0'
Conflicts:
ext/opcache/Optimizer/block_pass.c
| -rw-r--r-- | ext/opcache/Optimizer/block_pass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index 8599d9ba19..6ad5110999 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/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]); |