diff options
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 77702b3fac..23c3b99968 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6920,6 +6920,7 @@ static inline void zend_ct_eval_greater(zval *result, zend_ast_kind kind, zval * static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */ { zend_ast_list *list = zend_ast_get_list(ast); + zend_ast *last_elem_ast = NULL; uint32_t i; zend_bool is_constant = 1; @@ -6932,6 +6933,10 @@ static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */ zend_ast *elem_ast = list->child[i]; if (elem_ast == NULL) { + /* Report error at line of last non-empty element */ + if (last_elem_ast) { + CG(zend_lineno) = zend_ast_get_lineno(last_elem_ast); + } zend_error(E_COMPILE_ERROR, "Cannot use empty array elements in arrays"); } @@ -6943,6 +6948,8 @@ static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */ ) { is_constant = 0; } + + last_elem_ast = elem_ast; } if (!is_constant) { |