com php-src: Fix lineno for finally FAST_CALL and JMP: Zend/zend_compile.c
| From: | Nikita Popov | Date: | Wed, 30 Dec 2015 22:49:07 +0000 |
| Subject: | com php-src: Fix lineno for finally FAST_CALL and JMP: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90481@lists.php.net to get a copy of this message | ||
Commit: b3afeeabefc4777ec4797a7e2c3688e9e20be4cc
Author: Nikita Popov <nikic@php.net> Wed, 30 Dec 2015 23:49:07 +0100
Parents: 83c4417330c4bcb61ce1a9175ddad51c7353b5c9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b3afeeabefc4777ec4797a7e2c3688e9e20be4cc
Log:
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 9c07afe..ef9f194 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4481,6 +4481,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;