com php-src: Fixed ASSERTION: Zend/zend_gc.c Zend/zend_ gc.h
| From: | Xinchen Hui | Date: | Fri, 23 Jan 2015 06:18:56 +0000 |
| Subject: | com php-src: Fixed ASSERTION: Zend/zend_gc.c Zend/zend_ gc.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84340@lists.php.net to get a copy of this message | ||
Commit: 76f438e06fc61d32272a1f9877266c8d97d871ba
Author: Xinchen Hui <laruence@php.net> Fri, 23 Jan 2015 14:18:56 +0800
Parents: 16732dedfe84d16fa7ae11eff945672dc0214c7b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=76f438e06fc61d32272a1f9877266c8d97d871ba
Log:
Fixed ASSERTION
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 966b615..ea8c06f 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -137,11 +137,7 @@ ZEND_API void gc_init(void)
ZEND_API void gc_possible_root(zend_refcounted *ref)
{
- if (GC_TYPE(ref) == IS_NULL) {
- return;
- }
-
- ZEND_ASSERT(GC_TYPE(ref) == IS_ARRAY || GC_TYPE(ref) == IS_OBJECT);
+ ZEND_ASSERT(CG(unclean_shutdown) || (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 80425fc..40c9db7 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))) {
+ if (Z_COLLECTABLE_P(z) && UNEXPECTED(!Z_GC_INFO_P(z)) &&
EXPECTED(GC_TYPE(Z_COUNTED_P(z)) != IS_NULL)) {
gc_possible_root(Z_COUNTED_P(z));
}
}