diff options
Diffstat (limited to 'Zend/zend_variables.h')
| -rw-r--r-- | Zend/zend_variables.h | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index b0054eedd3..f039986c6e 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -55,29 +55,7 @@ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC) static zend_always_inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) { - if (Z_REFCOUNTED_P(zvalue) || Z_IMMUTABLE_P(zvalue)) { - if (Z_COPYABLE_P(zvalue) || Z_IMMUTABLE_P(zvalue)) { - _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC); - } else { - Z_ADDREF_P(zvalue); - } - } -} - -static zend_always_inline void _zval_opt_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) -{ - if (Z_OPT_REFCOUNTED_P(zvalue) || Z_OPT_IMMUTABLE_P(zvalue)) { - if (Z_OPT_COPYABLE_P(zvalue) || Z_OPT_IMMUTABLE_P(zvalue)) { - _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC); - } else { - Z_ADDREF_P(zvalue); - } - } -} - -static zend_always_inline void _zval_copy_ctor_no_imm(zval *zvalue ZEND_FILE_LINE_DC) -{ - if (Z_REFCOUNTED_P(zvalue)) { + if (Z_REFCOUNTED_P(zvalue) || Z_COPYABLE_P(zvalue)) { if (Z_COPYABLE_P(zvalue)) { _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC); } else { @@ -86,9 +64,9 @@ static zend_always_inline void _zval_copy_ctor_no_imm(zval *zvalue ZEND_FILE_LIN } } -static zend_always_inline void _zval_opt_copy_ctor_no_imm(zval *zvalue ZEND_FILE_LINE_DC) +static zend_always_inline void _zval_opt_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) { - if (Z_OPT_REFCOUNTED_P(zvalue)) { + if (Z_OPT_REFCOUNTED_P(zvalue) || Z_OPT_COPYABLE_P(zvalue)) { if (Z_OPT_COPYABLE_P(zvalue)) { _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC); } else { @@ -105,8 +83,6 @@ ZEND_API void _zval_internal_ptr_dtor(zval *zvalue ZEND_FILE_LINE_DC); ZEND_API void _zval_dtor_wrapper(zval *zvalue); #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_copy_ctor_no_imm(zvalue) _zval_copy_ctor_no_imm((zvalue) ZEND_FILE_LINE_CC) -#define zval_opt_copy_ctor_no_imm(zvalue) _zval_opt_copy_ctor_no_imm((zvalue) ZEND_FILE_LINE_CC) #define zval_dtor(zvalue) zval_ptr_dtor_nogc(zvalue) #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) |