diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-19 13:14:15 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-19 13:14:15 +0300 |
| commit | 5f349f3ab82965c2be784627e6ab2ed73093b708 (patch) | |
| tree | 57b2563a479abb6f720b0e6c6e289143e524892a | |
| parent | c2152a26621dd4b4bba3fe9183302c8a1fde9f2f (diff) | |
| download | php-git-5f349f3ab82965c2be784627e6ab2ed73093b708.tar.gz | |
Avoid useless duplication
| -rw-r--r-- | Zend/zend.c | 3 | ||||
| -rw-r--r-- | ext/spl/spl_array.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index ba84f84def..f42a987542 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -732,8 +732,9 @@ static zend_bool php_auto_globals_create_globals(zend_string *name) /* {{{ */ { zval globals; + /* IS_TYPE_COPYABLE, but with ref-counter 1 and not IS_TYPE_REFCOUNTED */ ZVAL_ARR(&globals, &EG(symbol_table)); - Z_TYPE_INFO_P(&globals) = IS_ARRAY; + Z_TYPE_FLAGS_P(&globals) = IS_TYPE_COPYABLE; ZVAL_NEW_REF(&globals, &globals); zend_hash_update(&EG(symbol_table), name, &globals); return 0; diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index f98f11106b..01001f2da7 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1118,9 +1118,13 @@ static void spl_array_set_array(zval *object, spl_array_object *intern, zval *ar } if (Z_TYPE_P(array) == IS_ARRAY) { - //??? TODO: try to avoid array duplication zval_ptr_dtor(&intern->array); - ZVAL_DUP(&intern->array, array); + if (Z_REFCOUNT_P(array) == 1) { + ZVAL_COPY(&intern->array, array); + } else { + //??? TODO: try to avoid array duplication + ZVAL_ARR(&intern->array, zend_array_dup(Z_ARR_P(array))); + } } else { if (Z_OBJ_HT_P(array) == &spl_handler_ArrayObject || Z_OBJ_HT_P(array) == &spl_handler_ArrayIterator) { zval_ptr_dtor(&intern->array); |