Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 38b52820b5eee3ad5fbb0ed83324052708856789..8a621cf34829d1e423a9cf1092b7dd1f11c8f3e1 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -51,17 +51,6 @@ ZEND_API int zend_eval_stringl_ex(char *str, size_t str_len, zval *retval_ptr, c
 ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, char **class_name, zend_class_entry **pce TSRMLS_DC);
 ZEND_API void zend_verify_arg_error(int error_type, const zend_function *zf, uint32_t arg_num, const char *need_msg, const char *need_kind, const char *given_msg, const char *given_kind, zval *arg TSRMLS_DC);
 
-static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC TSRMLS_DC)
-{
-       if (Z_REFCOUNTED_P(zval_ptr)) {
-               if (!Z_DELREF_P(zval_ptr)) {
-                       _zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC);
-               } else {
-                       GC_ZVAL_CHECK_POSSIBLE_ROOT(zval_ptr);
-               }
-       }
-}
-
 static zend_always_inline int i_zend_is_true(zval *op TSRMLS_DC)
 {
        int result;

diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h
index 4f840bdd8a4c54bc7d4d5f45344b6975d838a983..ea0434dc0ba02aa656961f97e72f5a01fbfaa76a 100644 (file)
--- a/Zend/zend_variables.h
+++ b/Zend/zend_variables.h
@@ -22,6 +22,8 @@
 #ifndef ZEND_VARIABLES_H
 #define ZEND_VARIABLES_H
 
+#include "zend_types.h"
+#include "zend_gc.h"
 
 BEGIN_EXTERN_C()
 
@@ -43,6 +45,17 @@ static zend_always_inline void _zval_ptr_dtor_nogc(zval *zval_ptr ZEND_FILE_LINE
        }
 }
 
+static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC TSRMLS_DC)
+{
+       if (Z_REFCOUNTED_P(zval_ptr)) {
+               if (!Z_DELREF_P(zval_ptr)) {
+                       _zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC);
+               } else {
+                       GC_ZVAL_CHECK_POSSIBLE_ROOT(zval_ptr);
+               }
+       }
+}
+
 ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC);
 
 #define zval_copy_ctor_func(zv) _zval_copy_ctor_func(zv ZEND_FILE_LINE_CC)