@@ -30,18 +30,6 @@ static void ZEND_FASTCALL zend_string_destroy(zend_string *str);
30
30
static void ZEND_FASTCALL zend_reference_destroy (zend_reference * ref );
31
31
static void ZEND_FASTCALL zend_empty_destroy (zend_reference * ref );
32
32
33
- #if ZEND_DEBUG
34
- static void ZEND_FASTCALL zend_array_destroy_wrapper (zend_array * arr );
35
- static void ZEND_FASTCALL zend_object_destroy_wrapper (zend_object * obj );
36
- static void ZEND_FASTCALL zend_resource_destroy_wrapper (zend_resource * res );
37
- static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper (zend_ast_ref * ast );
38
- #else
39
- # define zend_array_destroy_wrapper zend_array_destroy
40
- # define zend_object_destroy_wrapper zend_objects_store_del
41
- # define zend_resource_destroy_wrapper zend_list_free
42
- # define zend_ast_ref_destroy_wrapper zend_ast_ref_destroy
43
- #endif
44
-
45
33
typedef void (ZEND_FASTCALL * zend_rc_dtor_func_t )(zend_refcounted * p );
46
34
47
35
static const zend_rc_dtor_func_t zend_rc_dtor_func [] = {
@@ -52,11 +40,11 @@ static const zend_rc_dtor_func_t zend_rc_dtor_func[] = {
52
40
/* IS_LONG */ (zend_rc_dtor_func_t )zend_empty_destroy ,
53
41
/* IS_DOUBLE */ (zend_rc_dtor_func_t )zend_empty_destroy ,
54
42
/* IS_STRING */ (zend_rc_dtor_func_t )zend_string_destroy ,
55
- /* IS_ARRAY */ (zend_rc_dtor_func_t )zend_array_destroy_wrapper ,
56
- /* IS_OBJECT */ (zend_rc_dtor_func_t )zend_object_destroy_wrapper ,
57
- /* IS_RESOURCE */ (zend_rc_dtor_func_t )zend_resource_destroy_wrapper ,
43
+ /* IS_ARRAY */ (zend_rc_dtor_func_t )zend_array_destroy ,
44
+ /* IS_OBJECT */ (zend_rc_dtor_func_t )zend_objects_store_del ,
45
+ /* IS_RESOURCE */ (zend_rc_dtor_func_t )zend_list_free ,
58
46
/* IS_REFERENCE */ (zend_rc_dtor_func_t )zend_reference_destroy ,
59
- /* IS_CONSTANT_AST */ (zend_rc_dtor_func_t )zend_ast_ref_destroy_wrapper
47
+ /* IS_CONSTANT_AST */ (zend_rc_dtor_func_t )zend_ast_ref_destroy
60
48
};
61
49
62
50
ZEND_API void ZEND_FASTCALL rc_dtor_func (zend_refcounted * p )
@@ -84,28 +72,6 @@ static void ZEND_FASTCALL zend_empty_destroy(zend_reference *ref)
84
72
{
85
73
}
86
74
87
- #if ZEND_DEBUG
88
- static void ZEND_FASTCALL zend_array_destroy_wrapper (zend_array * arr )
89
- {
90
- zend_array_destroy (arr );
91
- }
92
-
93
- static void ZEND_FASTCALL zend_object_destroy_wrapper (zend_object * obj )
94
- {
95
- zend_objects_store_del (obj );
96
- }
97
-
98
- static void ZEND_FASTCALL zend_resource_destroy_wrapper (zend_resource * res )
99
- {
100
- zend_list_free (res );
101
- }
102
-
103
- static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper (zend_ast_ref * ast )
104
- {
105
- zend_ast_ref_destroy (ast );
106
- }
107
- #endif
108
-
109
75
ZEND_API void zval_ptr_dtor (zval * zval_ptr ) /* {{{ */
110
76
{
111
77
i_zval_ptr_dtor (zval_ptr );
0 commit comments