diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-20 01:11:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-20 01:11:37 +0300 |
| commit | c1dc10aaa5249ba54b6fa5bc043a80bd96f1c9e7 (patch) | |
| tree | e7d1e3a6e3b99a25287fa7272e40f8c6c31422d9 | |
| parent | 4433bb5069e8f8c739601e5e75ebd8fdbb2cabd0 (diff) | |
| parent | 6544ec5460d16ba48c1430bc59ae6475b4362686 (diff) | |
| download | php-git-c1dc10aaa5249ba54b6fa5bc043a80bd96f1c9e7.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed NOP removal (empty blocks should be shifted as well)
| -rw-r--r-- | ext/opcache/Optimizer/dfa_pass.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c index d0103ba026..8ec4230848 100644 --- a/ext/opcache/Optimizer/dfa_pass.c +++ b/ext/opcache/Optimizer/dfa_pass.c @@ -190,6 +190,8 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa) new_opline = op_array->opcodes + target - 1; zend_optimizer_migrate_jump(op_array, new_opline, opline); } + } else { + b->start = target; } } else { b->start = target; |