another try

Author: nielsdos

Zend/zend_API.c

@@ -1607,7 +1607,7 @@ static zend_always_inline void _object_properties_init(zend_object *object, zend
 	if (class_type->default_properties_count) {
 		zval *src = CE_DEFAULT_PROPERTIES_TABLE(class_type);
 		zval *dst = object->properties_table;
-#if 1
+#if 0
 		zval *end = src + class_type->default_properties_count;
 		if (UNEXPECTED(class_type->type == ZEND_INTERNAL_CLASS)) {
 			// do {
@@ -1634,7 +1634,13 @@ static zend_always_inline void _object_properties_init(zend_object *object, zend
 		} else {
 			// TODO: assertion?
 			/* zend_declare_typed_property() disallows refcounted default property values in internal classes */
-			memcpy(dst, src, sizeof(zval) * class_type->default_properties_count);
+			// memcpy(dst, src, sizeof(zval) * class_type->default_properties_count);
+			zval *end = src + class_type->default_properties_count;
+			do {
+				ZVAL_COPY_VALUE_PROP(dst, src);
+				src++;
+				dst++;
+			} while (src != end);
 		}
 #endif
 	}
@@ -4395,9 +4401,9 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
 			}
 		}
 		// printf("%s %s\n", ce->name->val, name->val);
-		// if (Z_REFCOUNTED_P(property)) {
-			// ce->ce_flags |= ZEND_ACC_HAS_RC_PROPS;
-		// }
+		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_inheritance.c

@@ -2538,7 +2538,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;
+		ce->ce_flags |= traits[i]->ce_flags & ZEND_ACC_HAS_RC_PROPS;
 	}
 }
 /* }}} */