Fix lineno for all constant expressions

Closes GH-8821

Author: iluuu1994

Zend/tests/gh8821.phpt

@@ -0,0 +1,21 @@
+--TEST--
+GH-8821: Fix reported line number of constant expression
+--FILE--
+<?php
+
+enum Alpha {
+    case Foo;
+}
+
+class Bravo {
+    public const C = [Alpha::Foo => 3];
+}
+
+new Bravo();
+
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: Illegal offset type in %s:8
+Stack trace:
+#0 {main}
+  thrown in %s on line 8

Zend/zend_ast.c

@@ -498,7 +498,7 @@ zend_class_entry *zend_ast_fetch_class(zend_ast *ast, zend_class_entry *scope)
 	return zend_fetch_class_with_scope(zend_ast_get_str(ast), ast->attr | ZEND_FETCH_CLASS_EXCEPTION, scope);
 }
 
-ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *scope)
+static zend_always_inline zend_result zend_ast_evaluate_ex(zval *result, zend_ast *ast, zend_class_entry *scope)
 {
 	zval op1, op2;
 	zend_result ret = SUCCESS;
@@ -794,29 +794,8 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate(zval *result, zend_ast *ast
 		{
 			zend_string *class_name = zend_ast_get_str(ast->child[0]);
 			zend_string *const_name = zend_ast_get_str(ast->child[1]);
-			zval *zv;
-			bool bailout = 0;
 
-			zend_string *previous_filename;
-			zend_long previous_lineno;
-			if (scope) {
-				previous_filename = EG(filename_override);
-				previous_lineno = EG(lineno_override);
-				EG(filename_override) = scope->info.user.filename;
-				EG(lineno_override) = zend_ast_get_lineno(ast);
-			}
-			zend_try {
-				zv = zend_get_class_constant_ex(class_name, const_name, scope, ast->attr);
-			} zend_catch {
-				bailout = 1;
-			}  zend_end_try();
-			if (scope) {
-				EG(filename_override) = previous_filename;
-				EG(lineno_override) = previous_lineno;
-			}
-			if (bailout) {
-				zend_bailout();
-			}
+			zval *zv = zend_get_class_constant_ex(class_name, const_name, scope, ast->attr);
 
 			if (UNEXPECTED(zv == NULL)) {
 				ZVAL_UNDEF(result);
@@ -914,6 +893,34 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate(zval *result, zend_ast *ast
 	return ret;
 }
 
+ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *scope)
+{
+	zend_string *previous_filename;
+	zend_long previous_lineno;
+	zend_result r;
+	bool threw = false;
+
+	if (scope) {
+		previous_filename = EG(filename_override);
+		previous_lineno = EG(lineno_override);
+		EG(filename_override) = scope->info.user.filename;
+		EG(lineno_override) = zend_ast_get_lineno(ast);
+	}
+	zend_try {
+		r = zend_ast_evaluate_ex(result, ast, scope);
+	} zend_catch {
+		threw = true;
+	} zend_end_try();
+	if (scope) {
+		EG(filename_override) = previous_filename;
+		EG(lineno_override) = previous_lineno;
+	}
+	if (threw) {
+		zend_bailout();
+	}
+	return r;
+}
+
 static size_t ZEND_FASTCALL zend_ast_tree_size(zend_ast *ast)
 {
 	size_t size;
@@ -950,12 +957,14 @@ static void* ZEND_FASTCALL zend_ast_tree_copy(zend_ast *ast, void *buf)
 		new->kind = ZEND_AST_ZVAL;
 		new->attr = ast->attr;
 		ZVAL_COPY(&new->val, zend_ast_get_zval(ast));
+		// Lineno gets copied with ZVAL_COPY
 		buf = (void*)((char*)buf + sizeof(zend_ast_zval));
 	} else if (ast->kind == ZEND_AST_CONSTANT) {
 		zend_ast_zval *new = (zend_ast_zval*)buf;
 		new->kind = ZEND_AST_CONSTANT;
 		new->attr = ast->attr;
 		ZVAL_STR_COPY(&new->val, zend_ast_get_constant_name(ast));
+		Z_LINENO(new->val) = zend_ast_get_lineno(ast);
 		buf = (void*)((char*)buf + sizeof(zend_ast_zval));
 	} else if (zend_ast_is_list(ast)) {
 		zend_ast_list *list = zend_ast_get_list(ast);
@@ -964,6 +973,7 @@ static void* ZEND_FASTCALL zend_ast_tree_copy(zend_ast *ast, void *buf)
 		new->kind = list->kind;
 		new->attr = list->attr;
 		new->children = list->children;
+		new->lineno = list->lineno;
 		buf = (void*)((char*)buf + zend_ast_list_size(list->children));
 		for (i = 0; i < list->children; i++) {
 			if (list->child[i]) {