com php-src: Use inline version of zval_ptr_dtor(): Zend/zend_variables.c

Commit: fb42d9d46ef66507f31ff08aae2bb6f7d115100e Author: Dmitry Stogov <dmitry@zend.com> Tue, 25 Nov 2014 13:05:35 +0300 Parents: ab7b38e33617c1364529b600f5ea74a2004c497f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fb42d9d46ef66507f31ff08aae2bb6f7d115100e Log: Use inline version of zval_ptr_dtor() Changed paths: M Zend/zend_variables.c Diff: diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 11d035e..1d3c0d2 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); }