From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 25 Nov 2014 10:05:35 +0000 (+0300)
Subject: Use inline version of zval_ptr_dtor()
X-Git-Tag: PRE_NATIVE_TLS_MERGE~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb42d9d46ef66507f31ff08aae2bb6f7d115100e;p=php

Use inline version of zval_ptr_dtor()
---

diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index 11d035e85c..1d3c0d2dcb 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -77,7 +77,9 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC)
 		case IS_REFERENCE: {
 				zend_reference *ref = (zend_reference*)p;
 				if (--GC_REFCOUNT(ref) == 0) {
-					zval_ptr_dtor(&ref->val);
+					TSRMLS_FETCH();
+
+					i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_RELAY_CC TSRMLS_CC);
 					efree_size(ref, sizeof(zend_reference));
 				}
 				break;
@@ -134,8 +136,9 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC)
 			}
 		case IS_REFERENCE: {
 				zend_reference *ref = (zend_reference*)p;
+				TSRMLS_FETCH();
 
-				zval_ptr_dtor(&ref->val);
+				i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_RELAY_CC TSRMLS_CC);
 				efree_size(ref, sizeof(zend_reference));
 				break;
 			}
@@ -293,7 +296,9 @@ ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue)
 
 ZEND_API void _zval_ptr_dtor_wrapper(zval *zval_ptr)
 {
-	zval_ptr_dtor(zval_ptr);
+	TSRMLS_FETCH();
+
+	i_zval_ptr_dtor(zval_ptr ZEND_FILE_LINE_RELAY_CC TSRMLS_CC);
 }