re-implementation and refactoring

Author: zeriyoshi

ext/date/php_date.c

@@ -140,6 +140,19 @@ static inline zend_long GENERATE_SEED(void)
 	return (zend_long)php_random_generate_fallback_seed();
 }
 
+static zend_always_inline uint64_t php_random_splitmix64_mix(uint64_t z)
+{
+	z = (z ^ (z >> 30)) * UINT64_C(0xbf58476d1ce4e5b9);
+	z = (z ^ (z >> 27)) * UINT64_C(0x94d049bb133111eb);
+
+	return z ^ (z >> 31);
+}
+
+static zend_always_inline uint64_t php_random_splitmix64(uint64_t *seed)
+{
+	return php_random_splitmix64_mix(*seed += UINT64_C(0x9e3779b97f4a7c15));
+}
+
 PHPAPI void *php_random_status_alloc(const php_random_algo *algo, const bool persistent);
 PHPAPI void *php_random_status_copy(const php_random_algo *algo, void *old_status, void *new_status);
 PHPAPI void php_random_status_free(void *status, const bool persistent);
@@ -160,17 +173,6 @@ static inline php_random_algo_with_state php_random_default_engine(void)
 	return raws;
 }
 
-static inline uint64_t php_random_splitmix64(uint64_t *seed)
-{
-	uint64_t r;
-
-	r = (*seed += 0x9e3779b97f4a7c15ULL);
-	r = (r ^ (r >> 30)) * 0xbf58476d1ce4e5b9ULL;
-	r = (r ^ (r >> 27)) * 0x94d049bb133111ebULL;
-
-	return (r ^ (r >> 31));
-}
-
 PHPAPI zend_string *php_random_bin2hex_le(const void *ptr, const size_t len);
 PHPAPI bool php_random_hex2bin_le(zend_string *hexstr, void *dest);
 

ext/random/php_random.h

@@ -18,7 +18,8 @@
 
 #include "php.h"
 #include "ext/standard/php_var.h"
-
+#include "zend_attributes.h"
+#include "ext/user_cache/php_user_cache.h" /* For user_cache safe direct path */
 #include "zend_smart_str.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
@@ -29,8 +30,6 @@
 #include "spl_exceptions.h"
 #include "spl_functions.h" /* For spl_set_private_debug_info_property() */
 
-#include "ext/user_cache/php_user_cache.h" /* For user_cache safe direct path */
-
 /* Defined later in the file */
 PHPAPI zend_class_entry  *spl_ce_ArrayIterator;
 PHPAPI zend_class_entry  *spl_ce_RecursiveArrayIterator;
@@ -63,6 +62,12 @@ static inline HashTable **spl_array_get_hash_table_ptr(spl_array_object* intern)
 	if (intern->ar_flags & SPL_ARRAY_IS_SELF) {
 		/* rebuild properties */
 		zend_std_get_properties_ex(&intern->std);
+		if (GC_REFCOUNT(intern->std.properties) > 1) {
+			if (EXPECTED(!(GC_FLAGS(intern->std.properties) & IS_ARRAY_IMMUTABLE))) {
+				GC_DELREF(intern->std.properties);
+			}
+			intern->std.properties = zend_array_dup(intern->std.properties);
+		}
 		return &intern->std.properties;
 	} else if (intern->ar_flags & SPL_ARRAY_USE_OTHER) {
 		spl_array_object *other = Z_SPLARRAY_P(&intern->array);
@@ -1406,8 +1411,6 @@ PHP_METHOD(ArrayObject, unserialize)
 
 } /* }}} */
 
-/* Builds the state array shared by __serialize() and the user-cache safe-direct
- * path. The members slot only exists in the __serialize() format. */
 static void spl_array_object_serialize_state(zval *object, zval *return_value, bool with_members)
 {
 	spl_array_object *intern = Z_SPLARRAY_P(object);
@@ -1449,8 +1452,6 @@ static void spl_array_object_serialize_state(zval *object, zval *return_value, b
 	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &tmp);
 }
 
-/* Restores the state array built above. Throws and returns false on malformed
- * data; the caller decides how to propagate the failure. */
 static PHP_UCACHE_HOT bool spl_array_object_unserialize_state(zval *object, HashTable *data, bool with_members)
 {
 	spl_array_object *intern = Z_SPLARRAY_P(object);
@@ -1551,11 +1552,11 @@ PHP_METHOD(ArrayObject, __unserialize)
 }
 /* }}} */
 
-static bool spl_array_object_copy_user_cache_state(
+static bool spl_array_object_copy_ucache_state(
 		void *ctx,
 		zend_object *new_obj,
 		zend_object *old_obj,
-		php_ucache_safe_direct_clone_value_func_t clone_value)
+		php_ucache_safe_direct_clone_val_func_t clone_value)
 {
 	spl_array_object *old_intern, *new_intern;
 	zval new_zv, cloned_storage_zv;
@@ -1579,57 +1580,66 @@ static bool spl_array_object_copy_user_cache_state(
 
 		result = true;
 
-		goto bailout;
+		goto cleanup;
 	}
 
 	if (!clone_value(ctx, &cloned_storage_zv, &old_intern->array) ||
 		(Z_TYPE(cloned_storage_zv) != IS_OBJECT && Z_TYPE(cloned_storage_zv) != IS_ARRAY)
 	) {
-		goto bailout;
+		goto cleanup;
 	}
 
 	spl_array_set_array(&new_zv, new_intern, &cloned_storage_zv, old_intern->ar_flags & SPL_ARRAY_CLONE_MASK, true);
 	result = !EG(exception);
 
-bailout:
-	zval_ptr_dtor(&cloned_storage_zv);
+cleanup:
+	if (Z_TYPE(cloned_storage_zv) != IS_UNDEF) {
+		zval_ptr_dtor(&cloned_storage_zv);
+	}
 
 	return result;
 }
 
-static bool spl_array_object_user_cache_state_has_unstorable(
-		void *ctx,
-		const zval *object,
-		php_ucache_safe_direct_value_has_unstorable_func_t value_has_unstorable)
+static bool spl_array_object_serialize_ucache_state(zval *state, const zval *object)
 {
-	spl_array_object *intern = Z_SPLARRAY_P(object);
+	zval *storage;
+
+	ZVAL_UNDEF(state);
+
+	spl_array_object_serialize_state((zval *) object, state, /* with_members */ false);
+
+	if (EG(exception) || Z_TYPE_P(state) != IS_ARRAY) {
+		if (Z_TYPE_P(state) != IS_UNDEF) {
+			zval_ptr_dtor(state);
+		}
+
+		ZVAL_UNDEF(state);
 
-	if (intern->ar_flags & SPL_ARRAY_IS_SELF) {
 		return false;
 	}
 
-	return value_has_unstorable(ctx, &intern->array);
-}
-
-static bool spl_array_object_serialize_user_cache_state(zval *state, const zval *object)
-{
-	spl_array_object_serialize_state((zval *) object, state, /* with_members */ false);
+	storage = zend_hash_index_find(Z_ARRVAL_P(state), 1);
+	if (storage != NULL && Z_TYPE_P(storage) == IS_ARRAY) {
+		SEPARATE_ARRAY(storage);
+	}
 
 	return true;
 }
 
-static PHP_UCACHE_HOT bool spl_array_object_unserialize_user_cache_state(zval *object, zval *state)
+static PHP_UCACHE_HOT bool spl_array_object_unserialize_ucache_state(zval *object, zval *state)
 {
+	if (Z_TYPE_P(state) != IS_ARRAY) {
+		return false;
+	}
+
 	return spl_array_object_unserialize_state(object, Z_ARRVAL_P(state), /* with_members */ false)
-		&& !EG(exception)
-	;
+		&& !EG(exception);
 }
 
-static const php_ucache_safe_direct_handlers_t spl_array_user_cache_handlers = {
-	.copy = spl_array_object_copy_user_cache_state,
-	.state_has_unstorable = spl_array_object_user_cache_state_has_unstorable,
-	.state_serialize = spl_array_object_serialize_user_cache_state,
-	.state_unserialize = spl_array_object_unserialize_user_cache_state,
+static const php_ucache_safe_direct_handlers spl_array_ucache_handlers = {
+	.copy = spl_array_object_copy_ucache_state,
+	.state_serialize = spl_array_object_serialize_ucache_state,
+	.state_unserialize = spl_array_object_unserialize_ucache_state,
 };
 
 /* {{{ */
@@ -2011,8 +2021,8 @@ PHP_MINIT_FUNCTION(spl_array)
 	spl_ce_RecursiveArrayIterator->create_object = spl_array_object_new;
 	spl_ce_RecursiveArrayIterator->get_iterator = spl_array_get_iterator;
 
-	php_ucache_safe_direct_register_class(spl_ce_ArrayObject, &spl_array_user_cache_handlers);
-	php_ucache_safe_direct_register_class(spl_ce_ArrayIterator, &spl_array_user_cache_handlers);
+	php_ucache_safe_direct_register_class(spl_ce_ArrayObject, &spl_array_ucache_handlers);
+	php_ucache_safe_direct_register_class(spl_ce_ArrayIterator, &spl_array_ucache_handlers);
 
 	return SUCCESS;
 }

ext/spl/spl_array.c

@@ -17,7 +17,7 @@
 #endif
 
 #include "php.h"
-
+#include "ext/user_cache/php_user_cache.h" /* For user_cache safe direct path */
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 #include "zend_hash.h"
@@ -29,8 +29,6 @@
 #include "spl_exceptions.h"
 #include "spl_functions.h" /* For spl_set_private_debug_info_property() */
 
-#include "ext/user_cache/php_user_cache.h" /* For user_cache safe direct path */
-
 static zend_object_handlers spl_handler_SplDoublyLinkedList;
 PHPAPI zend_class_entry  *spl_ce_SplDoublyLinkedList;
 PHPAPI zend_class_entry  *spl_ce_SplQueue;
@@ -1048,8 +1046,6 @@ PHP_METHOD(SplDoublyLinkedList, unserialize)
 
 } /* }}} */
 
-/* Builds the state array shared by __serialize() and the user-cache safe-direct
- * path. The members slot only exists in the __serialize() format. */
 static void spl_dllist_object_serialize_state(zval *object, zval *return_value, bool with_members)
 {
 	spl_dllist_object *intern = Z_SPLDLLIST_P(object);
@@ -1123,24 +1119,27 @@ PHP_METHOD(SplDoublyLinkedList, __unserialize) {
 	object_properties_load(&intern->std, Z_ARRVAL_P(members_zv));
 } /* }}} */
 
-static bool spl_dllist_object_copy_user_cache_state(
+static bool spl_dllist_object_copy_ucache_state(
 		void *ctx,
 		zend_object *new_obj,
 		zend_object *old_obj,
-		php_ucache_safe_direct_clone_value_func_t clone_value)
+		php_ucache_safe_direct_clone_val_func_t clone_value)
 {
 	spl_dllist_object *old_intern, *new_intern;
 	spl_ptr_llist_element *current;
 	zval cloned_elem;
 
 	old_intern = spl_dllist_from_obj(old_obj);
 	new_intern = spl_dllist_from_obj(new_obj);
-
-	ZEND_ASSERT(new_intern->llist->count == 0);
+	if (new_intern->llist->count != 0) {
+		return false;
+	}
 
 	new_intern->flags = old_intern->flags;
 	current = old_intern->llist->head;
 	while (current) {
+		ZVAL_UNDEF(&cloned_elem);
+
 		if (!clone_value(ctx, &cloned_elem, &current->data)) {
 			return false;
 		}
@@ -1155,42 +1154,23 @@ static bool spl_dllist_object_copy_user_cache_state(
 	return !EG(exception);
 }
 
-static bool spl_dllist_object_user_cache_state_has_unstorable(
-		void *ctx,
-		const zval *object,
-		php_ucache_safe_direct_value_has_unstorable_func_t value_has_unstorable)
-{
-	spl_dllist_object *intern;
-	spl_ptr_llist_element *current;
-
-	intern = Z_SPLDLLIST_P((zval *) object);
-	current = intern->llist->head;
-	while (current) {
-		if (value_has_unstorable(ctx, &current->data)) {
-			return true;
-		}
-
-		current = current->next;
-	}
-
-	return false;
-}
-
-static bool spl_dllist_object_serialize_user_cache_state(zval *state, const zval *object)
+static bool spl_dllist_object_serialize_ucache_state(zval *state, const zval *object)
 {
 	spl_dllist_object_serialize_state((zval *) object, state, /* with_members */ false);
 
 	return true;
 }
 
-/* Strict restore for the machine-written user-cache state: validates the flags
- * value. Returns false on malformed data. */
-static bool spl_dllist_object_unserialize_user_cache_state(zval *object, zval *state)
+static bool spl_dllist_object_unserialize_ucache_state(zval *object, zval *state)
 {
 	spl_dllist_object *intern = Z_SPLDLLIST_P(object);
 	zend_long flags;
 	zval *flags_zv, *storage_zv, *elem;
 
+	if (Z_TYPE_P(state) != IS_ARRAY) {
+		return false;
+	}
+
 	flags_zv = zend_hash_index_find(Z_ARRVAL_P(state), 0);
 	storage_zv = zend_hash_index_find(Z_ARRVAL_P(state), 1);
 	if (!flags_zv ||
@@ -1206,7 +1186,9 @@ static bool spl_dllist_object_unserialize_user_cache_state(zval *object, zval *s
 		return false;
 	}
 
-	ZEND_ASSERT(intern->llist->count == 0);
+	if (intern->llist->count != 0) {
+		return false;
+	}
 
 	intern->flags = (int) flags;
 
@@ -1217,11 +1199,10 @@ static bool spl_dllist_object_unserialize_user_cache_state(zval *object, zval *s
 	return !EG(exception);
 }
 
-static const php_ucache_safe_direct_handlers_t spl_dllist_user_cache_handlers = {
-	.copy = spl_dllist_object_copy_user_cache_state,
-	.state_has_unstorable = spl_dllist_object_user_cache_state_has_unstorable,
-	.state_serialize = spl_dllist_object_serialize_user_cache_state,
-	.state_unserialize = spl_dllist_object_unserialize_user_cache_state,
+static const php_ucache_safe_direct_handlers spl_dllist_ucache_handlers = {
+	.copy = spl_dllist_object_copy_ucache_state,
+	.state_serialize = spl_dllist_object_serialize_ucache_state,
+	.state_unserialize = spl_dllist_object_unserialize_ucache_state,
 };
 
 /* {{{ Inserts a new entry before the specified $index consisting of $newval. */
@@ -1342,7 +1323,7 @@ PHP_MINIT_FUNCTION(spl_dllist) /* {{{ */
 	spl_ce_SplStack->create_object = spl_dllist_object_new;
 	spl_ce_SplStack->get_iterator = spl_dllist_get_iterator;
 
-	php_ucache_safe_direct_register_class(spl_ce_SplDoublyLinkedList, &spl_dllist_user_cache_handlers);
+	php_ucache_safe_direct_register_class(spl_ce_SplDoublyLinkedList, &spl_dllist_ucache_handlers);
 
 	return SUCCESS;
 }