From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 19 Dec 2015 05:52:05 +0000 (-0800)
Subject: Fixed bug #71165 (-DGC_BENCH=1 doesn't work on PHP7)
X-Git-Tag: php-7.0.2RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a21b0942fa195974d2f0c65c61c22f275d54a9f3;p=php

Fixed bug #71165 (-DGC_BENCH=1 doesn't work on PHP7)
---

diff --git a/NEWS b/NEWS
index 70e11367aa..c770e71b30 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? Jan 2016 PHP 7.0.2
 
 - Core:
+  . Fixed bug #71165 (-DGC_BENCH=1 doesn't work on PHP7).
+    (y.uchiyama.1015 at gmail.com)
   . Fixed bug #71163 (Segmentation Fault: cleanup_unfinished_calls). (Laruence)
   . Fixed bug #71109 (ZEND_MOD_CONFLICTS("xdebug") doesn't work). (Laruence)
   . Fixed bug #71105 (Format String Vulnerability in Class Name Error Message).
diff --git a/Zend/zend.c b/Zend/zend.c
index ec520b8b0b..d211f14d0f 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -983,7 +983,6 @@ ZEND_API void zend_deactivate(void) /* {{{ */
 	fprintf(stderr, "        Root    Buffered     buffer     grey\n");
 	fprintf(stderr, "      --------  --------  -----------  ------\n");
 	fprintf(stderr, "ZVAL  %8d  %8d  %9d  %8d\n", GC_G(zval_possible_root), GC_G(zval_buffered), GC_G(zval_remove_from_buffer), GC_G(zval_marked_grey));
-	fprintf(stderr, "ZOBJ  %8d  %8d  %9d  %8d\n", GC_G(zobj_possible_root), GC_G(zobj_buffered), GC_G(zobj_remove_from_buffer), GC_G(zobj_marked_grey));
 #endif
 
 	zend_try {