Fix phpGH-14874: report correct line for property/const variance errors

Captures the AST lineno for typed properties, class constants, and
enum cases into a per-request side hashtable on the compiler globals
(CG(typed_member_lines)), keyed by member pointer. The inheritance
variance emitters look up the line via zend_get_typed_member_line and
route through zend_error_at_noreturn so the error points at the
offending child member rather than the class declaration. Internal
classes and trait-copied properties are not entered in the table and
fall back to zend_error_noreturn (legacy behavior, no regression).
Mirrors the line tracking zend_function::line_start already provides
for the parallel incompatible-method error path, without growing
zend_property_info or zend_class_constant.

Fixes phpGH-14874

Author: iliaal

Zend/tests/type_declarations/gh14874.phpt

@@ -0,0 +1,16 @@
+--TEST--
+GH-14874 (Incorrect lineno for property and class const variance check)
+--FILE--
+<?php
+
+class C extends P {
+    public const int X = 42;
+}
+
+class P {
+    public const string X = 'X';
+}
+
+?>
+--EXPECTF--
+Fatal error: Type of C::X must be compatible with P::X of type string in %s on line 4

Zend/tests/type_declarations/typed_properties_006.phpt

@@ -11,4 +11,4 @@ class Bar extends Foo {
 }
 ?>
 --EXPECTF--
-Fatal error: Type of Bar::$qux must be int (as in class Foo) in %s on line 6
+Fatal error: Type of Bar::$qux must be int (as in class Foo) in %s on line 7

Zend/tests/type_declarations/typed_properties_007.phpt

@@ -14,4 +14,4 @@ class Bar extends Foo {
 }
 ?>
 --EXPECTF--
-Fatal error: Type of Bar::$qux must be Whatever (as in class Foo) in %s on line 9
+Fatal error: Type of Bar::$qux must be Whatever (as in class Foo) in %s on line 10

Zend/tests/type_declarations/typed_properties_008.phpt

@@ -11,4 +11,4 @@ class Bar extends Foo {
 }
 ?>
 --EXPECTF--
-Fatal error: Type of Bar::$qux must be int (as in class Foo) in %s on line 6
+Fatal error: Type of Bar::$qux must be int (as in class Foo) in %s on line 7

Zend/zend_compile.c

@@ -463,6 +463,7 @@ void init_compiler(void) /* {{{ */
 	CG(delayed_variance_obligations) = NULL;
 	CG(delayed_autoloads) = NULL;
 	CG(unlinked_uses) = NULL;
+	CG(typed_member_lines) = NULL;
 	CG(current_linking_class) = NULL;
 }
 /* }}} */
@@ -491,10 +492,40 @@ void shutdown_compiler(void) /* {{{ */
 		FREE_HASHTABLE(CG(unlinked_uses));
 		CG(unlinked_uses) = NULL;
 	}
+	if (CG(typed_member_lines)) {
+		zend_hash_destroy(CG(typed_member_lines));
+		FREE_HASHTABLE(CG(typed_member_lines));
+		CG(typed_member_lines) = NULL;
+	}
 	CG(current_linking_class) = NULL;
 }
 /* }}} */
 
+ZEND_API void zend_set_typed_member_line(const void *member, uint32_t lineno) /* {{{ */
+{
+	if (lineno == 0) {
+		return;
+	}
+	if (!CG(typed_member_lines)) {
+		ALLOC_HASHTABLE(CG(typed_member_lines));
+		zend_hash_init(CG(typed_member_lines), 0, NULL, NULL, 0);
+	}
+	zval zv;
+	ZVAL_LONG(&zv, lineno);
+	zend_hash_index_update(CG(typed_member_lines), (zend_ulong)(uintptr_t)member, &zv);
+}
+/* }}} */
+
+ZEND_API uint32_t zend_get_typed_member_line(const void *member) /* {{{ */
+{
+	if (!CG(typed_member_lines)) {
+		return 0;
+	}
+	zval *zv = zend_hash_index_find(CG(typed_member_lines), (zend_ulong)(uintptr_t)member);
+	return zv ? (uint32_t)Z_LVAL_P(zv) : 0;
+}
+/* }}} */
+
 ZEND_API zend_string *zend_set_compiled_filename(zend_string *new_compiled_filename) /* {{{ */
 {
 	CG(compiled_filename) = zend_string_copy(new_compiled_filename);
@@ -8264,6 +8295,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
 				scope, name, &default_value,
 				property_flags | (zend_property_is_virtual(scope, name, hooks_ast) ? ZEND_ACC_VIRTUAL : 0) | ZEND_ACC_PROMOTED,
 				doc_comment, type);
+			zend_set_typed_member_line(prop, param_ast->lineno);
 			if (hooks_ast) {
 				const zend_ast_list *hooks = zend_ast_get_list(hooks_ast);
 				zend_compile_property_hooks(prop, name, type_ast, hooks);
@@ -9253,6 +9285,7 @@ static void zend_compile_prop_decl(zend_ast *ast, zend_ast *type_ast, uint32_t f
 		}
 
 		info = zend_declare_typed_property(ce, name, &value_zv, flags, doc_comment, type);
+		zend_set_typed_member_line(info, prop_ast->lineno);
 
 		if (hooks_ast) {
 			zend_compile_property_hooks(info, name, type_ast, zend_ast_get_list(hooks_ast));
@@ -9339,6 +9372,7 @@ static void zend_compile_class_const_decl(zend_ast *ast, uint32_t flags, zend_as
 		}
 
 		c = zend_declare_typed_class_constant(ce, name, &value_zv, flags, doc_comment, type);
+		zend_set_typed_member_line(c, const_ast->lineno);
 
 		if (attr_ast) {
 			zend_compile_attributes(&c->attributes, attr_ast, 0, ZEND_ATTRIBUTE_TARGET_CLASS_CONST, 0);
@@ -9800,6 +9834,7 @@ static void zend_compile_enum_case(zend_ast *ast)
 
 	zend_class_constant *c = zend_declare_class_constant_ex(enum_class, enum_case_name, &value_zv, ZEND_ACC_PUBLIC, doc_comment);
 	ZEND_CLASS_CONST_FLAGS(c) |= ZEND_CLASS_CONST_IS_CASE;
+	zend_set_typed_member_line(c, ast->lineno);
 	zend_ast_destroy(const_enum_init_ast);
 
 	zend_ast *attr_ast = ast->child[3];

Zend/zend_compile.h

@@ -904,6 +904,9 @@ ZEND_API zend_string *zend_get_compiled_filename(void);
 ZEND_API uint32_t zend_get_compiled_lineno(void);
 ZEND_API size_t zend_get_scanned_file_offset(void);
 
+ZEND_API void zend_set_typed_member_line(const void *member, uint32_t lineno);
+ZEND_API uint32_t zend_get_typed_member_line(const void *member);
+
 ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array *op_array, uint32_t var);
 
 #ifdef ZTS

Zend/zend_globals.h

@@ -156,6 +156,7 @@ struct _zend_compiler_globals {
 	HashTable *delayed_variance_obligations;
 	HashTable *delayed_autoloads;
 	HashTable *unlinked_uses;
+	HashTable *typed_member_lines;
 	zend_class_entry *current_linking_class;
 
 	uint32_t rtd_key_counter;

Zend/zend_inheritance.c

@@ -1308,27 +1308,50 @@ static inheritance_status full_property_types_compatible(
 static ZEND_COLD void emit_incompatible_property_error(
 		const zend_property_info *child, const zend_property_info *parent, prop_variance variance) {
 	zend_string *type_str = zend_type_to_string_resolved(parent->type, parent->ce);
-	zend_error_noreturn(E_COMPILE_ERROR,
-		"Type of %s::$%s must be %s%s (as in class %s)",
-		ZSTR_VAL(child->ce->name),
-		zend_get_unmangled_property_name(child->name),
-		variance == PROP_INVARIANT ? "" :
-		variance == PROP_COVARIANT ? "subtype of " : "supertype of ",
-		ZSTR_VAL(type_str),
-		ZSTR_VAL(parent->ce->name));
+	uint32_t line = zend_get_typed_member_line(child);
+	if (line && child->ce->type == ZEND_USER_CLASS) {
+		zend_error_at_noreturn(E_COMPILE_ERROR, child->ce->info.user.filename, line,
+			"Type of %s::$%s must be %s%s (as in class %s)",
+			ZSTR_VAL(child->ce->name),
+			zend_get_unmangled_property_name(child->name),
+			variance == PROP_INVARIANT ? "" :
+			variance == PROP_COVARIANT ? "subtype of " : "supertype of ",
+			ZSTR_VAL(type_str),
+			ZSTR_VAL(parent->ce->name));
+	} else {
+		zend_error_noreturn(E_COMPILE_ERROR,
+			"Type of %s::$%s must be %s%s (as in class %s)",
+			ZSTR_VAL(child->ce->name),
+			zend_get_unmangled_property_name(child->name),
+			variance == PROP_INVARIANT ? "" :
+			variance == PROP_COVARIANT ? "subtype of " : "supertype of ",
+			ZSTR_VAL(type_str),
+			ZSTR_VAL(parent->ce->name));
+	}
 }
 
 static ZEND_COLD void emit_set_hook_type_error(const zend_property_info *child, const zend_property_info *parent)
 {
 	zend_type set_type = parent->hooks[ZEND_PROPERTY_HOOK_SET]->common.arg_info[0].type;
 	zend_string *type_str = zend_type_to_string_resolved(set_type, parent->ce);
-	zend_error_noreturn(E_COMPILE_ERROR,
-		"Set type of %s::$%s must be supertype of %s (as in %s %s)",
-		ZSTR_VAL(child->ce->name),
-		zend_get_unmangled_property_name(child->name),
-		ZSTR_VAL(type_str),
-		zend_get_object_type_case(parent->ce, false),
-		ZSTR_VAL(parent->ce->name));
+	uint32_t line = zend_get_typed_member_line(child);
+	if (line && child->ce->type == ZEND_USER_CLASS) {
+		zend_error_at_noreturn(E_COMPILE_ERROR, child->ce->info.user.filename, line,
+			"Set type of %s::$%s must be supertype of %s (as in %s %s)",
+			ZSTR_VAL(child->ce->name),
+			zend_get_unmangled_property_name(child->name),
+			ZSTR_VAL(type_str),
+			zend_get_object_type_case(parent->ce, false),
+			ZSTR_VAL(parent->ce->name));
+	} else {
+		zend_error_noreturn(E_COMPILE_ERROR,
+			"Set type of %s::$%s must be supertype of %s (as in %s %s)",
+			ZSTR_VAL(child->ce->name),
+			zend_get_unmangled_property_name(child->name),
+			ZSTR_VAL(type_str),
+			zend_get_object_type_case(parent->ce, false),
+			ZSTR_VAL(parent->ce->name));
+	}
 }
 
 static inheritance_status verify_property_type_compatibility(
@@ -1621,13 +1644,24 @@ static void zend_do_inherit_interfaces(zend_class_entry *ce, const zend_class_en
 static void emit_incompatible_class_constant_error(
 		const zend_class_constant *child, const zend_class_constant *parent, const zend_string *const_name) {
 	zend_string *type_str = zend_type_to_string_resolved(parent->type, parent->ce);
-	zend_error_noreturn(E_COMPILE_ERROR,
-		"Type of %s::%s must be compatible with %s::%s of type %s",
-		ZSTR_VAL(child->ce->name),
-		ZSTR_VAL(const_name),
-		ZSTR_VAL(parent->ce->name),
-		ZSTR_VAL(const_name),
-		ZSTR_VAL(type_str));
+	uint32_t line = zend_get_typed_member_line(child);
+	if (line && child->ce->type == ZEND_USER_CLASS) {
+		zend_error_at_noreturn(E_COMPILE_ERROR, child->ce->info.user.filename, line,
+			"Type of %s::%s must be compatible with %s::%s of type %s",
+			ZSTR_VAL(child->ce->name),
+			ZSTR_VAL(const_name),
+			ZSTR_VAL(parent->ce->name),
+			ZSTR_VAL(const_name),
+			ZSTR_VAL(type_str));
+	} else {
+		zend_error_noreturn(E_COMPILE_ERROR,
+			"Type of %s::%s must be compatible with %s::%s of type %s",
+			ZSTR_VAL(child->ce->name),
+			ZSTR_VAL(const_name),
+			ZSTR_VAL(parent->ce->name),
+			ZSTR_VAL(const_name),
+			ZSTR_VAL(type_str));
+	}
 }
 
 static inheritance_status class_constant_types_compatible(const zend_class_constant *parent, const zend_class_constant *child)