experiemtn

Author: nielsdos

Zend/zend_API.c

@@ -1607,20 +1607,27 @@ 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;
-		zval *end = src + class_type->default_properties_count;
 
-		if (UNEXPECTED(class_type->type == ZEND_INTERNAL_CLASS)) {
-			do {
-				ZVAL_COPY_OR_DUP_PROP(dst, src);
-				src++;
-				dst++;
-			} while (src != end);
+		if (!(class_type->ce_flags & ZEND_ACC_HAS_RC_PROPS)) {
+			// printf("fast path %s\n", class_type->name->val);
+			memcpy(dst, src, sizeof(zval) * class_type->default_properties_count);
 		} else {
-			do {
-				ZVAL_COPY_PROP(dst, src);
-				src++;
-				dst++;
-			} while (src != end);
+			// printf("slow path %s\n", class_type->name->val);
+			zval *end = src + class_type->default_properties_count;
+
+			if (UNEXPECTED(class_type->type == ZEND_INTERNAL_CLASS)) {
+				do {
+					ZVAL_COPY_OR_DUP_PROP(dst, src);
+					src++;
+					dst++;
+				} while (src != end);
+			} else {
+				do {
+					ZVAL_COPY_PROP(dst, src);
+					src++;
+					dst++;
+				} while (src != end);
+			}
 		}
 	}
 }
@@ -4303,6 +4310,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 +4386,11 @@ 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;
 			}
 		}
+		// printf("%s %s\n", ce->name->val, name->val);
+		if (Z_REFCOUNTED_P(property)) {
+			// printf("refcounted\n");
+			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,8 @@ 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);
+	// printf("inherited %s from %s (%d)\n", ZSTR_VAL(ce->name), ZSTR_VAL(parent_ce->name), ce->ce_flags&ZEND_ACC_HAS_RC_PROPS);
 }
 /* }}} */