Implement ZEND_ACC_HAS_RC_PROPS

Author: nielsdos

Zend/zend_API.c

@@ -1609,15 +1609,17 @@ static zend_always_inline void _object_properties_init(zend_object *object, zend
 		zval *dst = object->properties_table;
 		zval *end = src + class_type->default_properties_count;
 
-		if (UNEXPECTED(class_type->type == ZEND_INTERNAL_CLASS)) {
+		if (EXPECTED(class_type->ce_flags & ZEND_ACC_HAS_RC_PROPS)) {
+			zval *end = src + class_type->default_properties_count;
 			do {
-				ZVAL_COPY_OR_DUP_PROP(dst, src);
+				ZVAL_COPY_PROP(dst, src);
 				src++;
 				dst++;
 			} while (src != end);
 		} else {
+			/* zend_declare_typed_property() disallows refcounted default property values in internal classes */
 			do {
-				ZVAL_COPY_PROP(dst, src);
+				ZVAL_COPY_VALUE_PROP(dst, src);
 				src++;
 				dst++;
 			} while (src != end);
@@ -4303,6 +4305,7 @@ static zend_always_inline bool is_persistent_class(zend_class_entry *ce) {
 ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, zend_string *name, zval *property, int access_type, zend_string *doc_comment, zend_type type) /* {{{ */
 {
 	zend_property_info *property_info, *property_info_ptr;
+	// printf("decl prop %s\n", name->val);
 
 	if (ZEND_TYPE_IS_SET(type)) {
 		ce->ce_flags |= ZEND_ACC_HAS_TYPE_HINTS;
@@ -4378,6 +4381,9 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
 				ce->properties_info_table[ce->default_properties_count - 1] = property_info;
 			}
 		}
+		if (Z_REFCOUNTED_P(property)) {
+			ce->ce_flags |= ZEND_ACC_HAS_RC_PROPS;
+		}
 		property_default_ptr = &ce->default_properties_table[OBJ_PROP_TO_NUM(property_info->offset)];
 		ZVAL_COPY_VALUE(property_default_ptr, property);
 		Z_PROP_FLAG_P(property_default_ptr) = Z_ISUNDEF_P(property) ? IS_PROP_UNINIT : 0;

Zend/zend_compile.h

@@ -239,7 +239,7 @@ typedef struct _zend_oparray_context {
 /* or IS_CONSTANT_VISITED_MARK                            |     |     |     */
 #define ZEND_CLASS_CONST_IS_CASE         (1 << 6)  /*     |     |     |  X  */
 /*                                                        |     |     |     */
-/* Class Flags (unused: 30,31)                            |     |     |     */
+/* Class Flags (unused: 31)                               |     |     |     */
 /* ===========                                            |     |     |     */
 /*                                                        |     |     |     */
 /* Special class types                                    |     |     |     */
@@ -304,6 +304,8 @@ typedef struct _zend_oparray_context {
 /*                                                        |     |     |     */
 /* Class cannot be serialized or unserialized             |     |     |     */
 #define ZEND_ACC_NOT_SERIALIZABLE        (1 << 29) /*  X  |     |     |     */
+/* Class has refcounted props                             |     |     |     */
+#define ZEND_ACC_HAS_RC_PROPS            (1 << 30) /*  X  |     |     |     */
 /*                                                        |     |     |     */
 /* Function Flags (unused: 29-30)                         |     |     |     */
 /* ==============                                         |     |     |     */

Zend/zend_inheritance.c

@@ -1672,7 +1672,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par
 			ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
 		}
 	}
-	ce->ce_flags |= parent_ce->ce_flags & (ZEND_HAS_STATIC_IN_METHODS | ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_HAS_READONLY_PROPS | ZEND_ACC_USE_GUARDS | ZEND_ACC_NOT_SERIALIZABLE | ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES);
+	ce->ce_flags |= parent_ce->ce_flags & (ZEND_HAS_STATIC_IN_METHODS | ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_HAS_READONLY_PROPS | ZEND_ACC_USE_GUARDS | ZEND_ACC_NOT_SERIALIZABLE | ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES | ZEND_ACC_HAS_RC_PROPS);
 }
 /* }}} */
 
@@ -2537,6 +2537,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_ent
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
+		ce->ce_flags |= traits[i]->ce_flags & ZEND_ACC_HAS_RC_PROPS;
 	}
 }
 /* }}} */

ext/standard/array.c

@@ -6470,14 +6470,14 @@ PHP_FUNCTION(array_map)
 		array_init_size(return_value, maxlen);
 		zend_hash_real_init(Z_ARRVAL_P(return_value), HT_IS_PACKED(Z_ARRVAL(arrays[0])));
 
-		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(arrays[0]), num_key, str_key, zv) {
-			fci.retval = &result;
-			fci.param_count = 1;
-			fci.params = &arg;
+		fci.retval = &result;
+		fci.param_count = 1;
+		fci.params = &arg;
 
+		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(arrays[0]), num_key, str_key, zv) {
 			ZVAL_COPY(&arg, zv);
 			ret = zend_call_function(&fci, &fci_cache);
-			i_zval_ptr_dtor(&arg);
+			Z_TRY_DELREF(arg); /* hash table still holds a reference, no dtor check is necessary */
 			if (ret != SUCCESS || Z_TYPE(result) == IS_UNDEF) {
 				zend_array_destroy(Z_ARR_P(return_value));
 				RETURN_NULL();