do not elide return checks for private/protected inner classes

withinboredom · withinboredom · commit 9ef21d428b9e · 2025-03-26T16:27:39.000+01:00
diff --git a/Zend/Optimizer/dfa_pass.c b/Zend/Optimizer/dfa_pass.c
@@ -282,7 +282,7 @@ static inline bool can_elide_list_type(
 			zend_string *lcname = zend_string_tolower(ZEND_TYPE_NAME(*single_type));
 			zend_class_entry *ce = zend_optimizer_get_class_entry(script, op_array, lcname);
 			zend_string_release(lcname);
-			bool result = ce && safe_instanceof(use_info->ce, ce);
+			bool result = ce && !ce->required_scope && safe_instanceof(use_info->ce, ce);
 			if (result == !is_intersection) {
 				return result;
 			}

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ static inline bool can_elide_list_type(`
`282`	`282`	`zend_string lcname = zend_string_tolower(ZEND_TYPE_NAME(single_type));`
`283`	`283`	`zend_class_entry *ce = zend_optimizer_get_class_entry(script, op_array, lcname);`
`284`	`284`	`zend_string_release(lcname);`
`285`		`- bool result = ce && safe_instanceof(use_info->ce, ce);`
	`285`	`+ bool result = ce && !ce->required_scope && safe_instanceof(use_info->ce, ce);`
`286`	`286`	`if (result == !is_intersection) {`
`287`	`287`	`return result;`
`288`	`288`	`}`