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_execute.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_execute.h')
| -rw-r--r-- | Zend/zend_execute.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 9701f1d6d8..c90531cb22 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -107,7 +107,7 @@ static zend_always_inline zval* zend_assign_to_variable(zval *variable_ptr, zval Z_ADDREF_P(variable_ptr); } } - ref_dtor_func(garbage); + zval_dtor_func(garbage); return variable_ptr; } else { /* we need to split */ /* optimized version of GC_ZVAL_CHECK_POSSIBLE_ROOT(variable_ptr) */ @@ -232,7 +232,7 @@ static zend_always_inline void zend_vm_stack_free_extra_args_ex(uint32_t call_in zend_refcounted *r = Z_COUNTED_P(p); if (!GC_DELREF(r)) { ZVAL_NULL(p); - ref_dtor_func(r); + zval_dtor_func(r); } else { gc_check_possible_root(r); } @@ -259,7 +259,7 @@ static zend_always_inline void zend_vm_stack_free_args(zend_execute_data *call) zend_refcounted *r = Z_COUNTED_P(p); if (!GC_DELREF(r)) { ZVAL_NULL(p); - ref_dtor_func(r); + zval_dtor_func(r); } } p++; |