diff options
Diffstat (limited to 'Zend/zend_variables.h')
| -rw-r--r-- | Zend/zend_variables.h | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 2dcd106da6..3d1e390994 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -28,16 +28,13 @@ BEGIN_EXTERN_C() -ZEND_API void ZEND_FASTCALL _rc_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC); -ZEND_API void ZEND_FASTCALL _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC); +ZEND_API void ZEND_FASTCALL rc_dtor_func(zend_refcounted *p); +ZEND_API void ZEND_FASTCALL zval_copy_ctor_func(zval *zvalue); -#define rc_dtor_func(ref) _rc_dtor_func(ref ZEND_FILE_LINE_CC) -#define zval_copy_ctor_func(zv) _zval_copy_ctor_func(zv ZEND_FILE_LINE_CC) - -static zend_always_inline void _zval_ptr_dtor_nogc(zval *zval_ptr ZEND_FILE_LINE_DC) +static zend_always_inline void zval_ptr_dtor_nogc(zval *zval_ptr) { if (Z_REFCOUNTED_P(zval_ptr) && !Z_DELREF_P(zval_ptr)) { - _rc_dtor_func(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC); + rc_dtor_func(Z_COUNTED_P(zval_ptr)); } } @@ -46,14 +43,14 @@ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC) if (Z_REFCOUNTED_P(zval_ptr)) { zend_refcounted *ref = Z_COUNTED_P(zval_ptr); if (!GC_DELREF(ref)) { - _rc_dtor_func(ref ZEND_FILE_LINE_RELAY_CC); + rc_dtor_func(ref); } else { gc_check_possible_root(ref); } } } -static zend_always_inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) +static zend_always_inline void zval_copy_ctor(zval *zvalue) { if (Z_TYPE_P(zvalue) == IS_ARRAY) { ZVAL_ARR(zvalue, zend_array_dup(Z_ARR_P(zvalue))); @@ -62,7 +59,7 @@ static zend_always_inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) } } -static zend_always_inline void _zval_opt_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) +static zend_always_inline void zval_opt_copy_ctor(zval *zvalue) { if (Z_OPT_TYPE_P(zvalue) == IS_ARRAY) { ZVAL_ARR(zvalue, zend_array_dup(Z_ARR_P(zvalue))); @@ -81,35 +78,22 @@ static zend_always_inline void zval_ptr_dtor_str(zval *zval_ptr) } } -ZEND_API void _zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC); -ZEND_API void _zval_internal_ptr_dtor(zval *zvalue ZEND_FILE_LINE_DC); -#define zval_copy_ctor(zvalue) _zval_copy_ctor((zvalue) ZEND_FILE_LINE_CC) -#define zval_opt_copy_ctor(zvalue) _zval_opt_copy_ctor((zvalue) ZEND_FILE_LINE_CC) -#define zval_ptr_dtor(zval_ptr) _zval_ptr_dtor((zval_ptr) ZEND_FILE_LINE_CC) -#define zval_ptr_dtor_nogc(zval_ptr) _zval_ptr_dtor_nogc((zval_ptr) ZEND_FILE_LINE_CC) -#define zval_internal_ptr_dtor(zvalue) _zval_internal_ptr_dtor((zvalue) ZEND_FILE_LINE_CC) +ZEND_API void zval_ptr_dtor(zval *zval_ptr); +ZEND_API void zval_internal_ptr_dtor(zval *zvalue); /* Kept for compatibility */ #define zval_dtor(zvalue) zval_ptr_dtor_nogc(zvalue) -#define zval_internal_dtor(zvalue) _zval_internal_ptr_dtor((zvalue) ZEND_FILE_LINE_CC) -#define zval_dtor_func _rc_dtor_func - -#if ZEND_DEBUG -ZEND_API void _zval_ptr_dtor_wrapper(zval *zval_ptr); -ZEND_API void _zval_internal_ptr_dtor_wrapper(zval *zvalue); -#define zval_ptr_dtor_wrapper _zval_ptr_dtor_wrapper -#define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor_wrapper -#else -#define zval_ptr_dtor_wrapper _zval_ptr_dtor -#define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor -#endif +#define zval_internal_dtor(zvalue) zval_internal_ptr_dtor(zvalue) +#define zval_dtor_func rc_dtor_func +#define zval_ptr_dtor_wrapper zval_ptr_dtor +#define zval_internal_ptr_dtor_wrapper zval_internal_ptr_dtor ZEND_API void zval_add_ref(zval *p); END_EXTERN_C() -#define ZVAL_PTR_DTOR zval_ptr_dtor_wrapper -#define ZVAL_INTERNAL_PTR_DTOR zval_internal_ptr_dtor_wrapper +#define ZVAL_PTR_DTOR zval_ptr_dtor +#define ZVAL_INTERNAL_PTR_DTOR zval_internal_ptr_dtor #endif |