Use inline version of zval_ptr_dtor()

dstogov · dstogov · commit fb42d9d46ef6 · 2014-11-25T13:05:35.000+03:00
diff --git 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);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,9 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC)`
`77`	`77`	`case IS_REFERENCE: {`
`78`	`78`	`zend_reference ref = (zend_reference)p;`
`79`	`79`	`if (--GC_REFCOUNT(ref) == 0) {`
`80`		`- zval_ptr_dtor(&ref->val);`
	`80`	`+ TSRMLS_FETCH();`
	`81`	`+`
	`82`	`+ i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_RELAY_CC TSRMLS_CC);`
`81`	`83`	`efree_size(ref, sizeof(zend_reference));`
`82`	`84`	`}`
`83`	`85`	`break;`
`@@ -134,8 +136,9 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC)`
`134`	`136`	`}`
`135`	`137`	`case IS_REFERENCE: {`
`136`	`138`	`zend_reference ref = (zend_reference)p;`
	`139`	`+ TSRMLS_FETCH();`
`137`	`140`
`138`		`- zval_ptr_dtor(&ref->val);`
	`141`	`+ i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_RELAY_CC TSRMLS_CC);`
`139`	`142`	`efree_size(ref, sizeof(zend_reference));`
`140`	`143`	`break;`
`141`	`144`	`}`
`@@ -293,7 +296,9 @@ ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue)`
`293`	`296`
`294`	`297`	`ZEND_API void _zval_ptr_dtor_wrapper(zval *zval_ptr)`
`295`	`298`	`{`
`296`		`- zval_ptr_dtor(zval_ptr);`
	`299`	`+ TSRMLS_FETCH();`
	`300`	`+`
	`301`	`+ i_zval_ptr_dtor(zval_ptr ZEND_FILE_LINE_RELAY_CC TSRMLS_CC);`
`297`	`302`	`}`
`298`	`303`
`299`	`304`