From 437404b03a7f5d240b90dd9411f31a37f1503604 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 11 Feb 2020 16:42:23 +0300 Subject: [PATCH] Reuse SEPARATE_ARRAY() macro --- Zend/zend_types.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Zend/zend_types.h b/Zend/zend_types.h index b9f09ffede..1b314afa24 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -1333,12 +1333,7 @@ static zend_always_inline uint32_t zval_delref_p(zval* pz) { #define SEPARATE_ZVAL_IF_NOT_REF(zv) do { \ zval *__zv = (zv); \ if (Z_TYPE_P(__zv) == IS_ARRAY) { \ - if (Z_REFCOUNT_P(__zv) > 1) { \ - if (Z_REFCOUNTED_P(__zv)) { \ - Z_DELREF_P(__zv); \ - } \ - ZVAL_ARR(__zv, zend_array_dup(Z_ARR_P(__zv)));\ - } \ + SEPARATE_ARRAY(__zv); \ } \ } while (0) -- 2.40.0