com php-src: Revert "Fixed ASSERTION": Zend/zend_gc.c Zen d/zend_gc.h

Commit: f71e64e53a99cc15f46a51dfa13c2f7baf4b2afb Author: Dmitry Stogov <dmitry@zend.com> Fri, 23 Jan 2015 16:37:39 +0300 Parents: 4369215b8fcaae61de0980fac8c247e54035f150 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f71e64e53a99cc15f46a51dfa13c2f7baf4b2afb Log: Revert "Fixed ASSERTION" This reverts commit 76f438e06fc61d32272a1f9877266c8d97d871ba. Changed paths: M Zend/zend_gc.c M Zend/zend_gc.h Diff: diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index ea8c06f..966b615 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -137,7 +137,11 @@ ZEND_API void gc_init(void) ZEND_API void gc_possible_root(zend_refcounted *ref) { - ZEND_ASSERT(CG(unclean_shutdown) || (GC_TYPE(ref) == IS_ARRAY || GC_TYPE(ref) == IS_OBJECT)); + if (GC_TYPE(ref) == IS_NULL) { + return; + } + + ZEND_ASSERT(GC_TYPE(ref) == IS_ARRAY || GC_TYPE(ref) == IS_OBJECT); GC_BENCH_INC(zval_possible_root); if (EXPECTED(GC_GET_COLOR(GC_INFO(ref)) == GC_BLACK)) { diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h index 40c9db7..80425fc 100644 --- a/Zend/zend_gc.h +++ b/Zend/zend_gc.h @@ -141,7 +141,7 @@ END_EXTERN_C() static zend_always_inline void gc_check_possible_root(zval *z) { ZVAL_DEREF(z); - if (Z_COLLECTABLE_P(z) && UNEXPECTED(!Z_GC_INFO_P(z)) && EXPECTED(GC_TYPE(Z_COUNTED_P(z)) != IS_NULL)) { + if (Z_COLLECTABLE_P(z) && UNEXPECTED(!Z_GC_INFO_P(z))) { gc_possible_root(Z_COUNTED_P(z)); } }