diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-19 17:47:26 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-19 17:47:26 +0300 |
| commit | 742d5a01ed5bd39a18929c04a5f5c5596a4b005b (patch) | |
| tree | c55c4fa3011823683ba58698d6bff121cdc5c864 /Zend/zend_variables.h | |
| parent | 465a8cfbadf267c65725e4c8a31c67b98f2f3697 (diff) | |
| download | php-git-742d5a01ed5bd39a18929c04a5f5c5596a4b005b.tar.gz | |
Get rid of IS_TYPE_COPYABLE.
Diffstat (limited to 'Zend/zend_variables.h')
| -rw-r--r-- | Zend/zend_variables.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 1f356bd000..9be2dc8d48 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -55,23 +55,19 @@ 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_COPYABLE_P(zvalue)) { - if (Z_COPYABLE_P(zvalue)) { - _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC); - } else { - Z_ADDREF_P(zvalue); - } + if (Z_TYPE_P(zvalue) == IS_ARRAY) { + ZVAL_ARR(zvalue, zend_array_dup(Z_ARR_P(zvalue))); + } else if (Z_REFCOUNTED_P(zvalue)) { + 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_COPYABLE_P(zvalue)) { - if (Z_OPT_COPYABLE_P(zvalue)) { - _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC); - } else { - Z_ADDREF_P(zvalue); - } + if (Z_OPT_TYPE_P(zvalue) == IS_ARRAY) { + ZVAL_ARR(zvalue, zend_array_dup(Z_ARR_P(zvalue))); + } else if (Z_OPT_REFCOUNTED_P(zvalue)) { + Z_ADDREF_P(zvalue); } } |