]> granicus.if.org Git - php/commitdiff
Remove spurious `CG(context).in_finally` dingleberry
authorSammy Kaye Powers <sammyk@sammykmedia.com>
Mon, 10 Apr 2017 15:43:33 +0000 (10:43 -0500)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 10 Apr 2017 20:58:44 +0000 (22:58 +0200)
Zend/zend_compile.c
Zend/zend_compile.h

index e760676e6f6fee2728cb1efae687dc57fb340613..4ea065acaba4d31ccf03fe57340ef25b76e25e30 100644 (file)
@@ -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
index 5018602a1ff5cff704b222f2294057eafc25f329..e7180853431e219803da986281ed279e4516c0df 100644 (file)
@@ -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;