com php-src: Set CG(zend_lineno) to beginning for final class errors/ops: Zend/zend_compile.c
| From: | Bob Weinand | Date: | Mon, 27 Jul 2015 22:57:49 +0000 |
| Subject: | com php-src: Set CG(zend_lineno) to beginning for final class errors/ops: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88187@lists.php.net to get a copy of this message | ||
Commit: 33a91f57e9a749e62631ccc76b850b17fde218ee
Author: Bob Weinand <bobwei9@hotmail.com> Tue, 28 Jul 2015 00:56:18 +0200
Parents: b6bcf9c51ac2b3a679d983e82893839ab5fee5ed
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33a91f57e9a749e62631ccc76b850b17fde218ee
Log:
Set CG(zend_lineno) to beginning for final class errors/ops
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index f0ddbd4..b7be2e9 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5255,6 +5255,9 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */
zend_compile_stmt(stmt_ast);
+ /* Reset lineno for final opcodes and errors */
+ CG(zend_lineno) = ast->lineno;
+
if (ce->num_traits == 0) {
/* For traits this check is delayed until after trait binding */
zend_check_deprecated_constructor(ce);