Separate trait constant binding from property binding and a bit of cleanup

Author: sj-i

Zend/zend_inheritance.c

@@ -2204,23 +2204,6 @@ static void zend_do_traits_method_binding(zend_class_entry *ce, zend_class_entry
 }
 /* }}} */
 
-static zend_class_entry* find_first_property_definition(zend_class_entry *ce, zend_class_entry **traits, size_t current_trait, zend_string *prop_name, zend_class_entry *colliding_ce) /* {{{ */
-{
-	size_t i;
-
-	if (colliding_ce == ce) {
-		for (i = 0; i < current_trait; i++) {
-			if (traits[i]
-			 && zend_hash_exists(&traits[i]->properties_info, prop_name)) {
-				return traits[i];
-			}
-		}
-	}
-
-	return colliding_ce;
-}
-/* }}} */
-
 static zend_class_entry* find_first_constant_definition(zend_class_entry *ce, zend_class_entry **traits, size_t current_trait, zend_string *constant_name, zend_class_entry *colliding_ce) /* {{{ */
 {
 	size_t i;
@@ -2238,9 +2221,8 @@ static zend_class_entry* find_first_constant_definition(zend_class_entry *ce, ze
 }
 /* }}} */
 
-static bool do_trait_constant_check(
-	zend_class_entry *ce, zend_class_constant *trait_constant, zend_string *name, zend_class_entry **traits, size_t current_trait
-) {
+static bool do_trait_constant_check(zend_class_entry *ce, zend_class_constant *trait_constant, zend_string *name, zend_class_entry **traits, size_t current_trait) /* {{{ */
+{
 	bool is_compatible = false;
 	uint32_t flags_mask = ZEND_ACC_PPP_MASK | ZEND_ACC_FINAL;
 
@@ -2266,33 +2248,63 @@ static bool do_trait_constant_check(
 }
 /* }}} */
 
-static void do_inherit_trait_constant(zend_string *name, zend_class_constant *c, zend_class_entry *ce, zend_class_entry **traits, size_t current_trait) /* {{{ */
+static void zend_do_traits_constant_binding(zend_class_entry *ce, zend_class_entry **traits) /* {{{ */
 {
-	if (do_trait_constant_check(ce, c, name, traits, current_trait)) {
-		zend_class_constant *ct = NULL;
+	size_t i;
 
-		ct = zend_arena_alloc(&CG(arena),sizeof(zend_class_constant));
-		memcpy(ct, c, sizeof(zend_class_constant));
-		c = ct;
+	for (i = 0; i < ce->num_traits; i++) {
+		zend_string *constant_name;
+		zend_class_constant *constant;
 
-		if (Z_TYPE(c->value) == IS_CONSTANT_AST) {
-			ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
-			ce->ce_flags |= ZEND_ACC_HAS_AST_CONSTANTS;
+		if (!traits[i]) {
+			continue;
 		}
 
-		c->ce = ce;
-		Z_TRY_ADDREF(c->value);
-		c->doc_comment = c->doc_comment ? zend_string_copy(c->doc_comment) : NULL;
-		if (c->attributes && (!(GC_FLAGS(c->attributes) & IS_ARRAY_IMMUTABLE))) {
-			GC_ADDREF(c->attributes);
-		}
+		ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&traits[i]->constants_table, constant_name, constant) {
+			if (do_trait_constant_check(ce, constant, constant_name, traits, i)) {
+				zend_class_constant *ct = NULL;
 
-		zend_hash_update_ptr(&ce->constants_table, name, c);
+				ct = zend_arena_alloc(&CG(arena),sizeof(zend_class_constant));
+				memcpy(ct, constant, sizeof(zend_class_constant));
+				constant = ct;
+
+				if (Z_TYPE(constant->value) == IS_CONSTANT_AST) {
+					ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
+					ce->ce_flags |= ZEND_ACC_HAS_AST_CONSTANTS;
+				}
+
+				constant->ce = ce;
+				Z_TRY_ADDREF(constant->value);
+				constant->doc_comment = constant->doc_comment ? zend_string_copy(constant->doc_comment) : NULL;
+				if (constant->attributes && (!(GC_FLAGS(constant->attributes) & IS_ARRAY_IMMUTABLE))) {
+					GC_ADDREF(constant->attributes);
+				}
+
+				zend_hash_update_ptr(&ce->constants_table, constant_name, constant);
+			}
+		} ZEND_HASH_FOREACH_END();
+	}
+}
+/* }}} */
+
+static zend_class_entry* find_first_property_definition(zend_class_entry *ce, zend_class_entry **traits, size_t current_trait, zend_string *prop_name, zend_class_entry *colliding_ce) /* {{{ */
+{
+	size_t i;
+
+	if (colliding_ce == ce) {
+		for (i = 0; i < current_trait; i++) {
+			if (traits[i]
+			 && zend_hash_exists(&traits[i]->properties_info, prop_name)) {
+				return traits[i];
+			}
+		}
 	}
+
+	return colliding_ce;
 }
 /* }}} */
 
-static void zend_do_traits_property_and_constant_binding(zend_class_entry *ce, zend_class_entry **traits) /* {{{ */
+static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_entry **traits) /* {{{ */
 {
 	size_t i;
 	zend_property_info *property_info;
@@ -2301,8 +2313,6 @@ static void zend_do_traits_property_and_constant_binding(zend_class_entry *ce, z
 	zend_string* prop_name;
 	zval* prop_value;
 	zend_string *doc_comment;
-	zend_string *constant_name;
-	zend_class_constant *constant;
 
 	/* In the following steps the properties are inserted into the property table
 	 * for that, a very strict approach is applied:
@@ -2313,10 +2323,6 @@ static void zend_do_traits_property_and_constant_binding(zend_class_entry *ce, z
 		if (!traits[i]) {
 			continue;
 		}
-		ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&traits[i]->constants_table, constant_name, constant) {
-			do_inherit_trait_constant(constant_name, constant, ce, traits, i);
-		} ZEND_HASH_FOREACH_END();
-
 		ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&traits[i]->properties_info, prop_name, property_info) {
 			uint32_t flags = property_info->flags;
 
@@ -2407,8 +2413,9 @@ static void zend_do_bind_traits(zend_class_entry *ce, zend_class_entry **traits)
 		efree(exclude_tables);
 	}
 
-	/* then flatten the properties into it, to, mostly to notify developer about problems */
-	zend_do_traits_property_and_constant_binding(ce, traits);
+	/* then flatten the constants and properties into it, to, mostly to notify developer about problems */
+	zend_do_traits_constant_binding(ce, traits);
+	zend_do_traits_property_binding(ce, traits);
 }
 /* }}} */