test

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 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);
@@ -1639,6 +1639,24 @@ static zend_always_inline void _object_properties_init(zend_object *object, zend
 				} while (src != end);
 			}
 		}
+#endif
+		if (UNEXPECTED(class_type->ce_flags & ZEND_ACC_HAS_RC_PROPS)) {
+			// 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);
+		}
 	}
 }
 /* }}} */

Zend/zend_operators.c

@@ -2372,28 +2372,6 @@ static int hash_zval_identical_function(zval *z1, zval *z2) /* {{{ */
 }
 /* }}} */
 
-ZEND_API bool ZEND_FASTCALL zend_is_identical2(const zval *op1, const zval *op2)
-{
-	switch (Z_TYPE_P(op1)) {
-		case IS_LONG:
-			return (Z_LVAL_P(op1) == Z_LVAL_P(op2));
-		case IS_RESOURCE:
-			return (Z_RES_P(op1) == Z_RES_P(op2));
-		case IS_DOUBLE:
-			return (Z_DVAL_P(op1) == Z_DVAL_P(op2));
-		case IS_STRING:
-			return zend_string_equals(Z_STR_P(op1), Z_STR_P(op2));
-		case IS_ARRAY:
-			return (Z_ARRVAL_P(op1) == Z_ARRVAL_P(op2) ||
-				zend_hash_compare(Z_ARRVAL_P(op1), Z_ARRVAL_P(op2), (compare_func_t) hash_zval_identical_function, 1) == 0);
-		case IS_OBJECT:
-			return (Z_OBJ_P(op1) == Z_OBJ_P(op2));
-		default:
-			return 0;
-	}
-}
-
-// TODO: use zend_is_identical2 ?
 ZEND_API bool ZEND_FASTCALL zend_is_identical(const zval *op1, const zval *op2) /* {{{ */
 {
 	if (Z_TYPE_P(op1) != Z_TYPE_P(op2)) {

Zend/zend_operators.h

@@ -56,7 +56,6 @@ ZEND_API zend_result ZEND_FASTCALL shift_right_function(zval *result, zval *op1,
 ZEND_API zend_result ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2);
 
 ZEND_API bool ZEND_FASTCALL zend_is_identical(const zval *op1, const zval *op2);
-ZEND_API bool ZEND_FASTCALL zend_is_identical2(const zval *op1, const zval *op2);
 
 ZEND_API zend_result ZEND_FASTCALL is_equal_function(zval *result, zval *op1, zval *op2);
 ZEND_API zend_result ZEND_FASTCALL is_identical_function(zval *result, zval *op1, zval *op2);
@@ -857,7 +856,7 @@ static zend_always_inline bool fast_is_identical_function(zval *op1, zval *op2)
 	} else if (Z_TYPE_P(op1) <= IS_TRUE) {
 		return 1;
 	}
-	return zend_is_identical2(op1, op2);
+	return zend_is_identical(op1, op2);
 }
 
 static zend_always_inline bool fast_is_not_identical_function(zval *op1, zval *op2)
@@ -867,7 +866,7 @@ static zend_always_inline bool fast_is_not_identical_function(zval *op1, zval *o
 	} else if (Z_TYPE_P(op1) <= IS_TRUE) {
 		return 0;
 	}
-	return !zend_is_identical2(op1, op2);
+	return !zend_is_identical(op1, op2);
 }
 
 /* buf points to the END of the buffer */