#17725 remove unlinked_instanceof

rekmixa · rekmixa · commit 66df47f3bb61 · 2025-02-19T18:24:54.000+05:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -503,8 +503,7 @@ static inheritance_status zend_is_class_subtype_of_type(
 	}
 
 	/* Replacing static with self in final classes is okay */
-	if ((ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC) &&
-		(fe_scope->ce_flags & ZEND_ACC_FINAL) && unlinked_instanceof(fe_scope, proto_scope)) {
+	if ((ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC) && (fe_scope->ce_flags & ZEND_ACC_FINAL)) {
 		if (!fe_ce) fe_ce = lookup_class(fe_scope, fe_class_name);
 		if (!fe_ce) {
 			have_unresolved = 1;

Original file line number	Diff line number	Diff line change
`@@ -503,8 +503,7 @@ static inheritance_status zend_is_class_subtype_of_type(`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`/* Replacing static with self in final classes is okay */`
`506`		`- if ((ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC) &&`
`507`		`- (fe_scope->ce_flags & ZEND_ACC_FINAL) && unlinked_instanceof(fe_scope, proto_scope)) {`
	`506`	`+ if ((ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC) && (fe_scope->ce_flags & ZEND_ACC_FINAL)) {`
`508`	`507`	`if (!fe_ce) fe_ce = lookup_class(fe_scope, fe_class_name);`
`509`	`508`	`if (!fe_ce) {`
`510`	`509`	`have_unresolved = 1;`