Removed commented code and unnecessary inline function

diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index 30df9aa64cf4a56b4748453b9e57e9bb7f8b673c..239b2194317c7d11d319db07516ca7282a9cb28b 100644 (file)
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -249,7 +249,7 @@ ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC)
        }
 }
 
-ZEND_API void _gc_remove_zval_from_buffer(zval *zv)
+ZEND_API void gc_remove_zval_from_buffer(zval *zv)
 {
        gc_root_buffer* root_buffer = GC_ADDRESS(((zval_gc_info*)zv)->u.buffered);
        TSRMLS_FETCH();
@@ -476,9 +476,6 @@ static void zval_collect_white(zval *pz TSRMLS_DC)
                        }
                } else {
                        if (Z_TYPE_P(pz) == IS_ARRAY) {
-//                             if (Z_ARRVAL_P(pz) == &EG(symbol_table)) {
-//                                     return;
-//                             }
                                zend_hash_apply(Z_ARRVAL_P(pz), (apply_func_t) children_collect_white TSRMLS_CC);
                                Z_ARRVAL_P(pz)->pDestructor = NULL;
                        }

diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h
index 16d43df057ca74a10e68ab004c00d09f57ef8e4a..a1d6c352f12b469188e426ae7732979e20de998e 100644 (file)
--- a/Zend/zend_gc.h
+++ b/Zend/zend_gc.h
@@ -139,7 +139,7 @@ BEGIN_EXTERN_C()
 ZEND_API int  gc_collect_cycles(TSRMLS_D);
 ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC);
 ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC);
-ZEND_API void _gc_remove_zval_from_buffer(zval *zv);
+ZEND_API void gc_remove_zval_from_buffer(zval *zv);
 ZEND_API void gc_globals_ctor(TSRMLS_D);
 ZEND_API void gc_globals_dtor(TSRMLS_D);
 ZEND_API void gc_init(TSRMLS_D);
@@ -152,8 +152,10 @@ END_EXTERN_C()
 #define GC_REMOVE_FROM_BUFFER(current) \
        gc_remove_from_buffer((current) TSRMLS_CC)
 
-#define GC_REMOVE_ZVAL_FROM_BUFFER(z) \
-       gc_remove_zval_from_buffer(z)
+#define GC_REMOVE_ZVAL_FROM_BUFFER(z)                                  \
+       if (GC_ADDRESS(((zval_gc_info*)z)->u.buffered)) {       \
+               gc_remove_zval_from_buffer(z);                                  \
+       }
 
 #define GC_ZOBJ_CHECK_POSSIBLE_ROOT(zobject)                                                                   \
        do {                                                                                                                                            \
@@ -188,13 +190,6 @@ static zend_always_inline void gc_remove_from_buffer(gc_root_buffer *root TSRMLS
        GC_BENCH_DEC(root_buf_length);
 }
 
-static zend_always_inline void gc_remove_zval_from_buffer(zval* z)
-{
-       if (GC_ADDRESS(((zval_gc_info*)z)->u.buffered)) {
-               _gc_remove_zval_from_buffer(z);
-       }
-}
-
 #define ALLOC_PERMANENT_ZVAL(z)                                                        \
        do {                                                                                            \
                (z) = (zval*)malloc(sizeof(zval_gc_info));              \