Remove an unnecessary comparison

sj-i · sj-i · commit b69376b95c65 · 2022-07-31T17:31:55.000+09:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -2253,9 +2253,6 @@ static bool do_trait_constant_check(
 
 	zend_class_constant *old_constant = Z_PTR_P(zv);
 
-	if (trait_constant->ce == old_constant->ce) {
-		return true;
-	}
 	if ((ZEND_CLASS_CONST_FLAGS(trait_constant) & flags_mask) == (ZEND_CLASS_CONST_FLAGS(old_constant) & flags_mask)) {
 		is_compatible = check_trait_property_or_constant_value_compatibility(ce, &trait_constant->value, &old_constant->value);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2253,9 +2253,6 @@ static bool do_trait_constant_check(`
`2253`	`2253`
`2254`	`2254`	`zend_class_constant *old_constant = Z_PTR_P(zv);`
`2255`	`2255`
`2256`		`- if (trait_constant->ce == old_constant->ce) {`
`2257`		`- return true;`
`2258`		`- }`
`2259`	`2256`	`if ((ZEND_CLASS_CONST_FLAGS(trait_constant) & flags_mask) == (ZEND_CLASS_CONST_FLAGS(old_constant) & flags_mask)) {`
`2260`	`2257`	`is_compatible = check_trait_property_or_constant_value_compatibility(ce, &trait_constant->value, &old_constant->value);`
`2261`	`2258`	`}`