Test overhead of tracking the flag

Author: nielsdos

Zend/zend_API.c

@@ -1607,39 +1607,22 @@ 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 0
-		if (false && !(class_type->ce_flags & ZEND_ACC_HAS_RC_PROPS)) {//TODO: disabled; also actually this may replace the internal class thing?
-			// printf("fast path %s\n", class_type->name->val);
-			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);
+#if 1
+		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 {
-			// 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);
-				// TODO: assertion?
-				/* zend_declare_typed_property() disallows refcounted default property values in internal classes */
-				memcpy(dst, src, sizeof(zval) * class_type->default_properties_count);
-			} else {
-				zval *end = src + class_type->default_properties_count;
-				do {
-					ZVAL_COPY_PROP(dst, src);
-					src++;
-					dst++;
-				} while (src != end);
-			}
+			do {
+				ZVAL_COPY_PROP(dst, src);
+				src++;
+				dst++;
+			} while (src != end);
 		}
-#endif
+#else
 		if (EXPECTED(class_type->ce_flags & ZEND_ACC_HAS_RC_PROPS)) {
 			zval *end = src + class_type->default_properties_count;
 			do {
@@ -1652,6 +1635,7 @@ static zend_always_inline void _object_properties_init(zend_object *object, zend
 			/* zend_declare_typed_property() disallows refcounted default property values in internal classes */
 			memcpy(dst, src, sizeof(zval) * class_type->default_properties_count);
 		}
+#endif
 	}
 }
 /* }}} */