diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-07-06 18:37:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-07-06 18:37:45 +0800 |
| commit | e3355ac5ec1787b84ffd08c863dfbd26fe7bfb0f (patch) | |
| tree | 7a1cd1b77a93162e0d60b0e90fa269e4338d6ecf /Zend/zend_variables.h | |
| parent | a362ae6b12419369c5cbdbb4e924915f9b196ef6 (diff) | |
| download | php-git-e3355ac5ec1787b84ffd08c863dfbd26fe7bfb0f.tar.gz | |
Revert "Rename _zval_dtor_func to _ref_dtor_func"
This reverts commit a362ae6b12419369c5cbdbb4e924915f9b196ef6.
Diffstat (limited to 'Zend/zend_variables.h')
| -rw-r--r-- | Zend/zend_variables.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 50cd38c28d..ebc6c5b40c 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -28,16 +28,16 @@ BEGIN_EXTERN_C() -ZEND_API void ZEND_FASTCALL _ref_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC); +ZEND_API void ZEND_FASTCALL _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC); ZEND_API void ZEND_FASTCALL _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC); -#define ref_dtor_func(ref) _ref_dtor_func(ref ZEND_FILE_LINE_CC) +#define zval_dtor_func(zv) _zval_dtor_func(zv 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) { if (Z_REFCOUNTED_P(zval_ptr) && !Z_DELREF_P(zval_ptr)) { - _ref_dtor_func(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC); + _zval_dtor_func(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC); } } @@ -46,7 +46,7 @@ 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)) { - _ref_dtor_func(ref ZEND_FILE_LINE_RELAY_CC); + _zval_dtor_func(ref ZEND_FILE_LINE_RELAY_CC); } else { gc_check_possible_root(ref); } @@ -92,7 +92,6 @@ ZEND_API void _zval_internal_ptr_dtor(zval *zvalue ZEND_FILE_LINE_DC); /* 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 _ref_dtor_func #if ZEND_DEBUG ZEND_API void _zval_ptr_dtor_wrapper(zval *zval_ptr); |