From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 26 Aug 2019 15:52:56 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0RC1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa8565a0f1d8276f478eb0bd495e535828ff124c;p=php

Merge branch 'PHP-7.3' into PHP-7.4
---

fa8565a0f1d8276f478eb0bd495e535828ff124c
diff --cc Zend/zend_gc.c
index 60e128ef19,3a36a8cc0d..b74a8e79b9
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@@ -1379,8 -1400,12 +1379,12 @@@ tail_call
  					ref = Z_COUNTED_P(zv);
  					goto tail_call;
  				}
+ 				if (GC_REF_ADDRESS(ht) != 0 && GC_REF_CHECK_COLOR(ht, GC_BLACK)) {
+ 					GC_TRACE_REF(ht, "removing from buffer");
+ 					GC_REMOVE_FROM_BUFFER(ht);
+ 				}
  			} else {
 -				return;
 +				return count;
  			}
  		} else if (GC_TYPE(ref) == IS_ARRAY) {
  			ht = (zend_array*)ref;