com php-src: Merge branch 'PHP-5.6': Zend/zend_gc.c

From: Date: Thu, 02 Apr 2015 09:37:34 +0000
Subject: com php-src: Merge branch 'PHP-5.6': Zend/zend_gc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86049@lists.php.net to get a copy of this message
Commit: 7c2956d15c7b5e8ce10efb1bb80470ff8a8dc9fd Author: Dmitry Stogov <dmitry@zend.com> Thu, 2 Apr 2015 12:37:34 +0300 Parents: 0d240c3c5607f8be206f310b2c59b3f92bd5362c baf5fdf59863b75917cee1d65d632e9dc8c6d6a6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7c2956d15c7b5e8ce10efb1bb80470ff8a8dc9fd Log: Merge branch 'PHP-5.6' * PHP-5.6: Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer. Conflicts: NEWS Zend/zend_gc.c Changed paths: MM Zend/zend_gc.c Diff: diff --cc Zend/zend_gc.c index 8eb53e9,83458db..e0364c9 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@@ -143,13 -144,10 +143,11 @@@ ZEND_API void ZEND_FASTCALL gc_possible return; } + ZEND_ASSERT(GC_TYPE(ref) == IS_ARRAY || GC_TYPE(ref) == IS_OBJECT); GC_BENCH_INC(zval_possible_root); - if (GC_ZVAL_GET_COLOR(zv) != GC_PURPLE) { - if (!GC_ZVAL_ADDRESS(zv)) { + if (EXPECTED(GC_GET_COLOR(GC_INFO(ref)) == GC_BLACK)) { - GC_SET_PURPLE(GC_INFO(ref)); - + if (!GC_ADDRESS(GC_INFO(ref))) { gc_root_buffer *newRoot = GC_G(unused); if (newRoot) { @@@ -159,12 -157,11 +157,11 @@@ GC_G(first_unused)++; } else { if (!GC_G(gc_enabled)) { - GC_SET_BLACK(GC_INFO(ref)); return; } - zv->refcount__gc++; - gc_collect_cycles(TSRMLS_C); - zv->refcount__gc--; + GC_REFCOUNT(ref)++; + gc_collect_cycles(); + GC_REFCOUNT(ref)--; newRoot = GC_G(unused); if (!newRoot) { return; @@@ -172,7 -169,7 +169,7 @@@ GC_G(unused) = newRoot->prev; } - GC_ZVAL_SET_PURPLE(zv); ++ GC_SET_PURPLE(GC_INFO(ref)); newRoot->next = GC_G(roots).next; newRoot->prev = &GC_G(roots); GC_G(roots).next->prev = newRoot;

« previous php.cvs (#86049) next »