#17725 add additional check for mask MAY_BE_STATIC

rekmixa · rekmixa · commit 9369f53c1021 · 2025-02-10T23:35:42.000+05:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -572,7 +572,8 @@ static inheritance_status zend_is_class_subtype_of_type(
 	}
 
 	// replacing static with self in final classes is okay
-	if (!is_intersection && fe_scope->ce_flags & ZEND_ACC_FINAL && instanceof_function(fe_scope, proto_scope)) {
+	if (!is_intersection && fe_scope->ce_flags & ZEND_ACC_FINAL &&
+		ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC && instanceof_function(fe_scope, proto_scope)) {
 		if (!fe_ce) fe_ce = lookup_class(fe_scope, fe_class_name);
 
 		if (fe_ce && instanceof_function(fe_ce, fe_scope)) {

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,8 @@ static inheritance_status zend_is_class_subtype_of_type(`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`// replacing static with self in final classes is okay`
`575`		`- if (!is_intersection && fe_scope->ce_flags & ZEND_ACC_FINAL && instanceof_function(fe_scope, proto_scope)) {`
	`575`	`+ if (!is_intersection && fe_scope->ce_flags & ZEND_ACC_FINAL &&`
	`576`	`+ ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC && instanceof_function(fe_scope, proto_scope)) {`
`576`	`577`	`if (!fe_ce) fe_ce = lookup_class(fe_scope, fe_class_name);`
`577`	`578`
`578`	`579`	`if (fe_ce && instanceof_function(fe_ce, fe_scope)) {`