From c1965f58d4dd3970912dcd6a63ccd5860bae1a97 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 5 Jun 2014 16:04:11 +0400
Subject: Use reference counting instead of zval duplication

---
 Zend/zend_variables.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Zend/zend_variables.c')

diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index 79bd00db13..2031b017eb 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -210,7 +210,7 @@ ZEND_API void zval_add_ref(zval *p)
 {
 	if (Z_REFCOUNTED_P(p)) {
 		if (Z_ISREF_P(p) && Z_REFCOUNT_P(p) == 1) {
-			ZVAL_DUP(p, Z_REFVAL_P(p));
+			ZVAL_COPY(p, Z_REFVAL_P(p));
 		} else {
 			Z_ADDREF_P(p);
 		}
@@ -340,7 +340,7 @@ ZEND_API int zval_copy_static_var(zval *p TSRMLS_DC, int num_args, va_list args,
 				}
 			}
 			if (is_ref) {
-				SEPARATE_ZVAL_TO_MAKE_IS_REF(p);
+				ZVAL_MAKE_REF(p);
 				Z_ADDREF_P(p);
 			} else if (Z_ISREF_P(p)) {
 				ZVAL_DUP(&tmp, Z_REFVAL_P(p));
-- 
cgit v1.2.1