Remove an unnecessary comparison

sj-i · sj-i · commit 120b149cf7ab · 2022-07-31T16:38:41.000+09:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -2184,9 +2184,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
`@@ -2184,9 +2184,6 @@ static bool do_trait_constant_check(`
`2184`	`2184`
`2185`	`2185`	`zend_class_constant *old_constant = Z_PTR_P(zv);`
`2186`	`2186`
`2187`		`- if (trait_constant->ce == old_constant->ce) {`
`2188`		`- return true;`
`2189`		`- }`
`2190`	`2187`	`if ((ZEND_CLASS_CONST_FLAGS(trait_constant) & flags_mask) == (ZEND_CLASS_CONST_FLAGS(old_constant) & flags_mask)) {`
`2191`	`2188`	`is_compatible = check_trait_property_or_constant_value_compatibility(ce, &trait_constant->value, &old_constant->value);`
`2192`	`2189`	`}`