com php-src: Remove spurious `CG(context).in_finally ` dingleberry: Zend/zend_compile.c Zend/zend_co mpile.h
[email protected] (Nikita Popov)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: e92896f735b876622c1115997f26542f33648291 Author: Sammy Kaye Powers <[email protected]> Mon, 10 Apr 2017 10:43:33 -0500 Committer: Nikita Popov <[email protected]> Mon, 10 Apr 2017 22:58:44 +0200 Parents: 797ee05a3c4c4ea9f1817930c92e50be6ef63da7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e92896f735b876622c1115997f26542f33648291 Log: Remove spurious `CG(context).in_finally` dingleberry Changed paths: M Zend/zend_compile.c M Zend/zend_compile.h Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e760676..4ea065a 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 5018602..e718085 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;