com php-src: MFH: Fix lineno for finally FAST_CALL and JM P: Zend/zend_compile.c
| From: | Derick Rethans | Date: | Thu, 31 Dec 2015 09:46:43 +0000 |
| Subject: | com php-src: MFH: Fix lineno for finally FAST_CALL and JM P: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90482@lists.php.net to get a copy of this message | ||
Commit: 5362f0ad7f6f1b0fe2dcee356a24bcd054c204f0
Author: Derick Rethans <github@derickrethans.nl> Thu, 31 Dec 2015 09:46:43 +0000
Parents: da028e075713c27c08ddb224888c4609d1241465
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5362f0ad7f6f1b0fe2dcee356a24bcd054c204f0
Log:
MFH: Fix lineno for finally FAST_CALL and JMP
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index d3e17d0..45f5b7e 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4184,6 +4184,8 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
/* Pop FAST_CALL from unwind stack */
zend_stack_del_top(&CG(loop_var_stack));
+ CG(zend_lineno) = finally_ast->lineno;
+
opline = zend_emit_op(NULL, ZEND_FAST_CALL, NULL, NULL);
opline->op1.num = try_catch_offset;
opline->result_type = IS_TMP_VAR;