Adjust dfa pass

Girgias · Girgias · commit 1bf0dd7b7036 · 2021-07-05T04:14:51.000+02:00
diff --git a/Zend/Optimizer/dfa_pass.c b/Zend/Optimizer/dfa_pass.c
@@ -317,7 +317,7 @@ static inline bool can_elide_return_type_check(
 				zend_string *lcname = zend_string_tolower(ZEND_TYPE_NAME(*single_type));
 				zend_class_entry *ce = zend_optimizer_get_class_entry(script, lcname);
 				zend_string_release(lcname);
-				if (ce && safe_instanceof(use_info->ce, ce)) {
+				if (ce && ZEND_TYPE_IS_UNION(arg_info->type) && safe_instanceof(use_info->ce, ce)) {
 					/* One of the class union types matched. */
 					return true;
 				}

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ static inline bool can_elide_return_type_check(`
`317`	`317`	`zend_string lcname = zend_string_tolower(ZEND_TYPE_NAME(single_type));`
`318`	`318`	`zend_class_entry *ce = zend_optimizer_get_class_entry(script, lcname);`
`319`	`319`	`zend_string_release(lcname);`
`320`		`- if (ce && safe_instanceof(use_info->ce, ce)) {`
	`320`	`+ if (ce && ZEND_TYPE_IS_UNION(arg_info->type) && safe_instanceof(use_info->ce, ce)) {`
`321`	`321`	`/* One of the class union types matched. */`
`322`	`322`	`return true;`
`323`	`323`	`}`