diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-05-05 23:31:57 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-05-05 23:31:57 +0200 |
| commit | bac6fdb0c52c924e726c5a78de8858bf27b6586b (patch) | |
| tree | 627f2ec8d91955e99456783aebd94ac5d4236f32 /Zend/zend_execute.h | |
| parent | 59f35c0ca9abfa72c5393f6c0350759a3f6512d8 (diff) | |
| download | php-git-bac6fdb0c52c924e726c5a78de8858bf27b6586b.tar.gz | |
Refactor zval cleanup into single function
Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
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 36a44f6395..24071719a2 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -98,7 +98,7 @@ static zend_always_inline zval* zend_assign_to_variable(zval *variable_ptr, zval Z_ADDREF_P(variable_ptr); } } - zval_dtor_func_for_ptr(garbage); + zval_dtor_func(garbage); return variable_ptr; } else { /* we need to split */ /* optimized version of GC_ZVAL_CHECK_POSSIBLE_ROOT(variable_ptr) */ @@ -220,7 +220,7 @@ static zend_always_inline void zend_vm_stack_free_extra_args_ex(uint32_t call_in if (!Z_DELREF_P(p)) { zend_refcounted *r = Z_COUNTED_P(p); ZVAL_NULL(p); - zval_dtor_func_for_ptr(r); + zval_dtor_func(r); } else { GC_ZVAL_CHECK_POSSIBLE_ROOT(p); } @@ -248,7 +248,7 @@ static zend_always_inline void zend_vm_stack_free_args(zend_execute_data *call) if (!Z_DELREF_P(p)) { zend_refcounted *r = Z_COUNTED_P(p); ZVAL_NULL(p); - zval_dtor_func_for_ptr(r); + zval_dtor_func(r); } } } while (p != end); |