Use arena allocator for inherited trait constants

Author: sj-i

Zend/zend_inheritance.c

@@ -1690,7 +1690,7 @@ static bool do_inherit_constant_check(
 }
 /* }}} */
 
-static void do_inherit_interface_constant(zend_string *name, zend_class_constant *c, zend_class_entry *ce, zend_class_entry *iface) /* {{{ */
+static void do_inherit_iface_constant(zend_string *name, zend_class_constant *c, zend_class_entry *ce, zend_class_entry *iface) /* {{{ */
 {
 	if (do_inherit_constant_check(ce, c, name)) {
 		zend_class_constant *ct;
@@ -1722,7 +1722,7 @@ static void do_interface_implementation(zend_class_entry *ce, zend_class_entry *
 	zend_class_constant *c;
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&iface->constants_table, key, c) {
-		do_inherit_interface_constant(key, c, ce, iface);
+		do_inherit_iface_constant(key, c, ce, iface);
 	} ZEND_HASH_FOREACH_END();
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&iface->function_table, key, func) {
@@ -2275,22 +2275,19 @@ static void do_inherit_trait_constant(zend_string *name, zend_class_constant *c,
 {
 	if (do_trait_constant_check(ce, c, name, traits, current_trait)) {
 		zend_class_constant *ct = NULL;
+
+		ct = zend_arena_alloc(&CG(arena),sizeof(zend_class_constant));
+		memcpy(ct, c, sizeof(zend_class_constant));
+		c = ct;
+
 		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[current_trait]->ce_flags & ZEND_ACC_IMMUTABLE) {
-				ct = zend_arena_alloc(&CG(arena), sizeof(zend_class_constant));
-				memcpy(ct, c, sizeof(zend_class_constant));
-				Z_CONSTANT_FLAGS(ct->value) |= CONST_OWNED;
+				Z_CONSTANT_FLAGS(c->value) |= CONST_OWNED;
 			}
 		}
 
-		if (!ct) {
-			ct = emalloc(sizeof(zend_class_constant));
-			memcpy(ct, c, sizeof(zend_class_constant));
-		}
-		c = ct;
-
 		c->ce = ce;
 		Z_TRY_ADDREF(c->value);
 		c->doc_comment = c->doc_comment ? zend_string_copy(c->doc_comment) : NULL;
@@ -2343,7 +2340,7 @@ static void zend_do_traits_property_and_constant_binding(zend_class_entry *ce, z
 					if ((colliding_prop->flags & flags_mask) == (flags & flags_mask) &&
 						property_types_compatible(property_info, colliding_prop) == INHERITANCE_SUCCESS
 					) {
-						/* the flags are identical, thus, the properties may be is_compatible */
+						/* the flags are identical, thus, the properties may be compatible */
 						zval *op1, *op2;
 
 						if (flags & ZEND_ACC_STATIC) {