From: Bob Weinand <bobwei9@hotmail.com>
Date: Fri, 10 Jul 2015 21:35:05 +0000 (+0200)
Subject: hmm, we do not need the nop after compilation, so does not matter for opcache...
X-Git-Tag: php-7.1.1RC1~35^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0584df0ad9e97dc89b6d81791249e5024ad41cc7;p=php

hmm, we do not need the nop after compilation, so does not matter for opcache...
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 3f773502d0..936ed38b7c 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4075,8 +4075,7 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
 		if ((labelzv = zend_hash_get_current_data_ex(CG(context).labels, &hpos))) {
 			zend_label *label = Z_PTR_P(labelzv);
 			if (label->opline_num == get_next_op_number(CG(active_op_array))) {
-				/* using a NOP doesn't work here, it would be removed by opcache */
-				zend_emit_jump(get_next_op_number(CG(active_op_array)) + 1);
+				zend_emit_op(NULL, ZEND_NOP, NULL, NULL);
 			}
 		}
 	}