From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 19 Sep 2017 22:10:31 +0000 (+0300)
Subject: Fixed NOP removal (empty blocks should be shifted as well)
X-Git-Tag: php-7.2.0RC3~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6544ec5460d16ba48c1430bc59ae6475b4362686;p=php

Fixed NOP removal (empty blocks should be shifted as well)
---

diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c
index 15245cff2a..ca4ca15e19 100644
--- a/ext/opcache/Optimizer/dfa_pass.c
+++ b/ext/opcache/Optimizer/dfa_pass.c
@@ -186,6 +186,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;