1 files changed, 115 insertions, 113 deletions

diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index c76ca89bd2..91bb603de4 100644
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -26,46 +26,67 @@
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 
-ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC)
+ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce)
 {
+	zval *p, *end;
+
+	GC_REFCOUNT(object) = 1;
+	GC_TYPE_INFO(object) = IS_OBJECT;
 	object->ce = ce;
 	object->properties = NULL;
-	object->properties_table = NULL;
-	object->guards = NULL;
+	zend_objects_store_put(object);
+	p = object->properties_table;
+	if (EXPECTED(ce->default_properties_count != 0)) {
+		end = p + ce->default_properties_count;
+		do {
+			ZVAL_UNDEF(p);
+			p++;
+		} while (p != end);
+	}
+	if (UNEXPECTED(ce->ce_flags & ZEND_ACC_USE_GUARDS)) {
+		GC_FLAGS(object) |= IS_OBJ_USE_GUARDS;
+		Z_PTR_P(p) = NULL;
+		ZVAL_UNDEF(p);
+	}
 }
 
-ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC)
+ZEND_API void zend_object_std_dtor(zend_object *object)
 {
-	if (object->guards) {
-		zend_hash_destroy(object->guards);
-		FREE_HASHTABLE(object->guards);
-	}
-	if (object->properties) {
-		zend_hash_destroy(object->properties);
-		FREE_HASHTABLE(object->properties);
-		if (object->properties_table) {
-			efree(object->properties_table);
-		}
-	} else if (object->properties_table) {
-		int i;
+	zval *p, *end;
 
-		for (i = 0; i < object->ce->default_properties_count; i++) {
-			if (object->properties_table[i]) {
-				zval_ptr_dtor(&object->properties_table[i]);
+	if (object->properties) {
+		if (EXPECTED(!(GC_FLAGS(object->properties) & IS_ARRAY_IMMUTABLE))) {
+			if (EXPECTED(--GC_REFCOUNT(object->properties) == 0)) {
+				GC_REMOVE_FROM_BUFFER(object->properties);
+				GC_TYPE_INFO(object->properties) = IS_NULL | (GC_WHITE << 16);
+				zend_array_destroy(object->properties);
 			}
 		}
-		efree(object->properties_table);
+	}
+	p = object->properties_table;
+	if (EXPECTED(object->ce->default_properties_count)) {
+		end = p + object->ce->default_properties_count;
+		do {
+			i_zval_ptr_dtor(p ZEND_FILE_LINE_CC);
+			p++;
+		} while (p != end);
+	}
+	if (UNEXPECTED(GC_FLAGS(object) & IS_OBJ_HAS_GUARDS)) {
+		HashTable *guards = Z_PTR_P(p);
+
+		ZEND_ASSERT(guards != NULL);
+		zend_hash_destroy(guards);
+		FREE_HASHTABLE(guards);
 	}
 }
 
-ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC)
+ZEND_API void zend_objects_destroy_object(zend_object *object)
 {
 	zend_function *destructor = object ? object->ce->destructor : NULL;
 
 	if (destructor) {
-		zval *old_exception;
-		zval *obj;
-		zend_object_store_bucket *obj_bucket;
+		zend_object *old_exception;
+		zval obj;
 
 		if (destructor->op_array.fn_flags & (ZEND_ACC_PRIVATE|ZEND_ACC_PROTECTED)) {
 			if (destructor->op_array.fn_flags & ZEND_ACC_PRIVATE) {
@@ -74,11 +95,11 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 				if (object->ce != EG(scope)) {
 					zend_class_entry *ce = object->ce;
 
-					zend_error(EG(in_execution) ? E_ERROR : E_WARNING,
+					zend_error(EG(current_execute_data) ? E_EXCEPTION | E_ERROR : E_WARNING,
 						"Call to private %s::__destruct() from context '%s'%s",
-						ce->name,
-						EG(scope) ? EG(scope)->name : "",
-						EG(in_execution) ? "" : " during shutdown ignored");
+						ce->name->val,
+						EG(scope) ? EG(scope)->name->val : "",
+						EG(current_execute_data) ? "" : " during shutdown ignored");
 					return;
 				}
 			} else {
@@ -87,25 +108,18 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 				if (!zend_check_protected(zend_get_function_root_class(destructor), EG(scope))) {
 					zend_class_entry *ce = object->ce;
 
-					zend_error(EG(in_execution) ? E_ERROR : E_WARNING,
+					zend_error(EG(current_execute_data) ? E_EXCEPTION | E_ERROR : E_WARNING,
 						"Call to protected %s::__destruct() from context '%s'%s",
-						ce->name,
-						EG(scope) ? EG(scope)->name : "",
-						EG(in_execution) ? "" : " during shutdown ignored");
+						ce->name->val,
+						EG(scope) ? EG(scope)->name->val : "",
+						EG(current_execute_data) ? "" : " during shutdown ignored");
 					return;
 				}
 			}
 		}
 
-		MAKE_STD_ZVAL(obj);
-		Z_TYPE_P(obj) = IS_OBJECT;
-		Z_OBJ_HANDLE_P(obj) = handle;
-		obj_bucket = &EG(objects_store).object_buckets[handle];
-		if (!obj_bucket->bucket.obj.handlers) {
-			obj_bucket->bucket.obj.handlers = &std_object_handlers;
-		}
-		Z_OBJ_HT_P(obj) = obj_bucket->bucket.obj.handlers;
-		zval_copy_ctor(obj);
+		ZVAL_OBJ(&obj, object);
+		Z_ADDREF(obj);
 
 		/* Make sure that destructors are protected from previously thrown exceptions.
 		 * For example, if an exception was thrown in a function and when the function's
@@ -113,8 +127,8 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 		 */
 		old_exception = NULL;
 		if (EG(exception)) {
-			if (Z_OBJ_HANDLE_P(EG(exception)) == handle) {
-				zend_error(E_ERROR, "Attempt to destruct pending exception");
+			if (EG(exception) == object) {
+				zend_error_noreturn(E_CORE_ERROR, "Attempt to destruct pending exception");
 			} else {
 				old_exception = EG(exception);
 				EG(exception) = NULL;
@@ -123,7 +137,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 		zend_call_method_with_0_params(&obj, object->ce, &destructor, ZEND_DESTRUCTOR_FUNC_NAME, NULL);
 		if (old_exception) {
 			if (EG(exception)) {
-				zend_exception_set_previous(EG(exception), old_exception TSRMLS_CC);
+				zend_exception_set_previous(EG(exception), old_exception);
 			} else {
 				EG(exception) = old_exception;
 			}
@@ -132,104 +146,92 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 	}
 }
 
-ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC)
-{
-	zend_object_std_dtor(object TSRMLS_CC);
-	efree(object);
-}
-
-ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type TSRMLS_DC)
+ZEND_API zend_object *zend_objects_new(zend_class_entry *ce)
 {
-	zend_object_value retval;
-
-	*object = emalloc(sizeof(zend_object));
-	(*object)->ce = class_type;
-	(*object)->properties = NULL;
-	(*object)->properties_table = NULL;
-	(*object)->guards = NULL;
-	retval.handle = zend_objects_store_put(*object, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) zend_objects_free_object_storage, NULL TSRMLS_CC);
-	retval.handlers = &std_object_handlers;
-	return retval;
-}
+	zend_object *object = emalloc(sizeof(zend_object) + zend_object_properties_size(ce));
 
-ZEND_API zend_object *zend_objects_get_address(const zval *zobject TSRMLS_DC)
-{
-	return (zend_object *)zend_object_store_get_object(zobject TSRMLS_CC);
+	zend_object_std_init(object, ce);
+	object->handlers = &std_object_handlers;
+	return object;
 }
 
-ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object_value new_obj_val, zend_object *old_object, zend_object_handle handle TSRMLS_DC)
+ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object *old_object)
 {
-	int i;
-
-	if (old_object->properties_table) {
-		if (!new_object->properties_table) {
-			new_object->properties_table = emalloc(sizeof(zval*) * old_object->ce->default_properties_count);
-			memset(new_object->properties_table, 0, sizeof(zval*) * old_object->ce->default_properties_count);
-		}
-		for (i = 0; i < old_object->ce->default_properties_count; i++) {
-			if (!new_object->properties) {
-				if (new_object->properties_table[i]) {
-					zval_ptr_dtor(&new_object->properties_table[i]);
-				}
-			}
-			if (!old_object->properties) {
-				new_object->properties_table[i] = old_object->properties_table[i];
-				if (new_object->properties_table[i]) {
-					Z_ADDREF_P(new_object->properties_table[i]);
-				}
+	if (old_object->ce->default_properties_count) {
+		zval *src = old_object->properties_table;
+		zval *dst = new_object->properties_table;
+		zval *end = src + old_object->ce->default_properties_count;
+
+		do {
+			i_zval_ptr_dtor(dst ZEND_FILE_LINE_CC);
+			ZVAL_COPY_VALUE(dst, src);
+			zval_add_ref(dst);
+			src++;
+			dst++;
+		} while (src != end);
+	} else if (old_object->properties && !old_object->ce->clone) {
+		/* fast copy */
+		if (EXPECTED(old_object->handlers == &std_object_handlers)) {
+			if (EXPECTED(!(GC_FLAGS(old_object->properties) & IS_ARRAY_IMMUTABLE))) {
+				GC_REFCOUNT(old_object->properties)++;
 			}
+			new_object->properties = old_object->properties;
+			return;
 		}
 	}
-	if (old_object->properties) {
+
+	if (old_object->properties &&
+	    EXPECTED(zend_hash_num_elements(old_object->properties))) {
+		zval *prop, new_prop;
+		zend_ulong num_key;
+		zend_string *key;
+
 		if (!new_object->properties) {
 			ALLOC_HASHTABLE(new_object->properties);
-			zend_hash_init(new_object->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+			zend_hash_init(new_object->properties, zend_hash_num_elements(old_object->properties), NULL, ZVAL_PTR_DTOR, 0);
+			zend_hash_real_init(new_object->properties, 0);
+		} else {
+			zend_hash_extend(new_object->properties, new_object->properties->nNumUsed + zend_hash_num_elements(old_object->properties), 0);
 		}
-		zend_hash_copy(new_object->properties, old_object->properties, (copy_ctor_func_t) zval_add_ref, (void *) NULL /* Not used anymore */, sizeof(zval *));
-		if (old_object->properties_table) {
-			HashPosition pos;
-			zend_property_info *prop_info;
-			for (zend_hash_internal_pointer_reset_ex(&old_object->ce->properties_info, &pos);
-			     zend_hash_get_current_data_ex(&old_object->ce->properties_info, (void**)&prop_info, &pos) == SUCCESS;
-			     zend_hash_move_forward_ex(&old_object->ce->properties_info, &pos)) {
-				if ((prop_info->flags & ZEND_ACC_STATIC) == 0) {
-					if (zend_hash_quick_find(new_object->properties, prop_info->name, prop_info->name_length+1, prop_info->h, (void**)&new_object->properties_table[prop_info->offset]) == FAILURE) {
-						new_object->properties_table[prop_info->offset] = NULL;
-					}
-				}
+
+		ZEND_HASH_FOREACH_KEY_VAL(old_object->properties, num_key, key, prop) {
+			if (Z_TYPE_P(prop) == IS_INDIRECT) {
+				ZVAL_INDIRECT(&new_prop, new_object->properties_table + (Z_INDIRECT_P(prop) - old_object->properties_table));
+			} else {
+				ZVAL_COPY_VALUE(&new_prop, prop);
+				zval_add_ref(&new_prop);
 			}
-		}
+			if (EXPECTED(key)) {
+				_zend_hash_append(new_object->properties, key, &new_prop);
+			} else {
+				zend_hash_index_add_new(new_object->properties, num_key, &new_prop);
+			}
+		} ZEND_HASH_FOREACH_END();
 	}
 
 	if (old_object->ce->clone) {
-		zval *new_obj;
-
-		MAKE_STD_ZVAL(new_obj);
-		new_obj->type = IS_OBJECT;
-		new_obj->value.obj = new_obj_val;
-		zval_copy_ctor(new_obj);
+		zval new_obj;
 
+		ZVAL_OBJ(&new_obj, new_object);
+		zval_copy_ctor(&new_obj);
 		zend_call_method_with_0_params(&new_obj, old_object->ce, &old_object->ce->clone, ZEND_CLONE_FUNC_NAME, NULL);
-
 		zval_ptr_dtor(&new_obj);
 	}
 }
 
-ZEND_API zend_object_value zend_objects_clone_obj(zval *zobject TSRMLS_DC)
+ZEND_API zend_object *zend_objects_clone_obj(zval *zobject)
 {
-	zend_object_value new_obj_val;
 	zend_object *old_object;
 	zend_object *new_object;
-	zend_object_handle handle = Z_OBJ_HANDLE_P(zobject);
 
 	/* assume that create isn't overwritten, so when clone depends on the
 	 * overwritten one then it must itself be overwritten */
-	old_object = zend_objects_get_address(zobject TSRMLS_CC);
-	new_obj_val = zend_objects_new(&new_object, old_object->ce TSRMLS_CC);
+	old_object = Z_OBJ_P(zobject);
+	new_object = zend_objects_new(old_object->ce);
 
-	zend_objects_clone_members(new_object, new_obj_val, old_object, handle TSRMLS_CC);
+	zend_objects_clone_members(new_object, old_object);
 
-	return new_obj_val;
+	return new_object;
 }
 
 /*