From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 7 Dec 2017 12:01:04 +0000 (+0300)
Subject: SEPARATE_STRING() micro optimization
X-Git-Tag: php-7.3.0alpha1~861
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bc76c408face42894c5ce53a1521ee07dc0475e;p=php

SEPARATE_STRING() micro optimization
---

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index fcd5da2817..6e7a1f3eee 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -1070,10 +1070,12 @@ static zend_always_inline uint32_t zval_delref_p(zval* pz) {
 #define SEPARATE_STRING(zv) do {						\
 		zval *_zv = (zv);								\
 		if (Z_REFCOUNT_P(_zv) > 1) {					\
-			if (Z_REFCOUNTED_P(_zv)) {					\
-				Z_DELREF_P(_zv);						\
-			}											\
-			zval_copy_ctor_func(_zv);					\
+			zend_string *_str = Z_STR_P(_zv);			\
+			ZEND_ASSERT(Z_REFCOUNTED_P(_zv));			\
+			ZEND_ASSERT(!ZSTR_IS_INTERNED(_str));		\
+			Z_DELREF_P(_zv);							\
+			ZVAL_NEW_STR(_zv, zend_string_init(			\
+				ZSTR_VAL(_str),	ZSTR_LEN(_str), 0));	\
 		}												\
 	} while (0)