From: Sammy Kaye Powers <sammyk@sammykmedia.com>
Date: Mon, 10 Apr 2017 15:43:33 +0000 (-0500)
Subject: Remove spurious `CG(context).in_finally` dingleberry
X-Git-Tag: php-7.2.0alpha1~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e92896f735b876622c1115997f26542f33648291;p=php

Remove spurious `CG(context).in_finally` dingleberry
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index e760676e6f..4ea065acab 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -234,7 +234,6 @@ void zend_oparray_context_begin(zend_oparray_context *prev_context) /* {{{ */
 	CG(context).vars_size = 0;
 	CG(context).literals_size = 0;
 	CG(context).backpatch_count = 0;
-	CG(context).in_finally = 0;
 	CG(context).fast_call_var = -1;
 	CG(context).try_catch_offset = -1;
 	CG(context).current_brk_cont = -1;
@@ -4936,9 +4935,7 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
 
 		zend_emit_op(NULL, ZEND_JMP, NULL, NULL);
 
-		CG(context).in_finally++;
 		zend_compile_stmt(finally_ast);
-		CG(context).in_finally--;
 
 		CG(active_op_array)->try_catch_array[try_catch_offset].finally_op = opnum_jmp + 1;
 		CG(active_op_array)->try_catch_array[try_catch_offset].finally_end
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 5018602a1f..e718085343 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -191,7 +191,6 @@ typedef struct _zend_oparray_context {
 	int        vars_size;
 	int        literals_size;
 	int        backpatch_count;
-	int        in_finally;
 	uint32_t   fast_call_var;
 	uint32_t   try_catch_offset;
 	int        current_brk_cont;