Remove ZEND_ACC_ABSTRACT from prop variance check

iluuu1994 · iluuu1994 · commit 8fcf34d598ce · 2024-08-23T16:13:23.000+02:00
Abstract properties are now virtual, unless they actually contain concrete hook
implementations using the backing field.
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -1396,7 +1396,7 @@ static void inherit_property_hook(
 }
 
 static prop_variance prop_get_variance(zend_property_info *prop_info) {
-	bool unbacked = prop_info->flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_VIRTUAL);
+	bool unbacked = prop_info->flags & ZEND_ACC_VIRTUAL;
 	if (unbacked && prop_info->hooks) {
 		if (!prop_info->hooks[ZEND_PROPERTY_HOOK_SET]) {
 			return PROP_COVARIANT;

Original file line number	Diff line number	Diff line change
`@@ -1396,7 +1396,7 @@ static void inherit_property_hook(`
`1396`	`1396`	`}`
`1397`	`1397`
`1398`	`1398`	`static prop_variance prop_get_variance(zend_property_info *prop_info) {`
`1399`		`- bool unbacked = prop_info->flags & (ZEND_ACC_ABSTRACT\|ZEND_ACC_VIRTUAL);`
	`1399`	`+ bool unbacked = prop_info->flags & ZEND_ACC_VIRTUAL;`
`1400`	`1400`	`if (unbacked && prop_info->hooks) {`
`1401`	`1401`	`if (!prop_info->hooks[ZEND_PROPERTY_HOOK_SET]) {`
`1402`	`1402`	`return PROP_COVARIANT;`