From cca2c8ecc4048537e442ffa96c791df9a84a1690 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 6 May 2016 10:09:04 +0300 Subject: Reimplemented Bob's commit bac6fdb0c52c924e726c5a78de8858bf27b6586b without insignificant renaming and white-space changes --- Zend/zend_variables.c | 52 --------------------------------------------------- 1 file changed, 52 deletions(-) (limited to 'Zend/zend_variables.c') diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 01b68c25a4..dc75353e62 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -30,10 +30,6 @@ ZEND_API void ZEND_FASTCALL _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) { - if (--GC_REFCOUNT(p)) { - return; - } - switch (GC_TYPE(p)) { case IS_STRING: case IS_CONSTANT: { @@ -79,54 +75,6 @@ ZEND_API void ZEND_FASTCALL _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC } } -ZEND_API void ZEND_FASTCALL _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) -{ - switch (GC_TYPE(p)) { - case IS_STRING: - case IS_CONSTANT: { - zend_string *str = (zend_string*)p; - CHECK_ZVAL_STRING_REL(str); - zend_string_free(str); - break; - } - case IS_ARRAY: { - zend_array *arr = (zend_array*)p; - - zend_array_destroy(arr); - break; - } - case IS_CONSTANT_AST: { - zend_ast_ref *ast = (zend_ast_ref*)p; - - zend_ast_destroy_and_free(ast->ast); - efree_size(ast, sizeof(zend_ast_ref)); - break; - } - case IS_OBJECT: { - zend_object *obj = (zend_object*)p; - - zend_objects_store_del(obj); - break; - } - case IS_RESOURCE: { - zend_resource *res = (zend_resource*)p; - - /* destroy resource */ - zend_list_free(res); - break; - } - case IS_REFERENCE: { - zend_reference *ref = (zend_reference*)p; - - i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_RELAY_CC); - efree_size(ref, sizeof(zend_reference)); - break; - } - default: - break; - } -} - ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) { switch (Z_TYPE_P(zvalue)) { -- cgit v1.2.1