MFH: Fix lineno for finally FAST_CALL and JMP
authorDerick Rethans <github@derickrethans.nl>
Thu, 31 Dec 2015 09:46:43 +0000 (09:46 +0000)
committerDerick Rethans <github@derickrethans.nl>
Thu, 31 Dec 2015 09:46:43 +0000 (09:46 +0000)
Zend/zend_compile.c

index d3e17d0ec4b12ceb3a60e4ef435584d6831a88ac..45f5b7eafbed65a059c874801e6252dcd92bf0d1 100644 (file)
@@ -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;