From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 13 Aug 2019 10:17:47 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ae0b68404292a411f1918f66f0d4d859e51e5bc;p=php

Merge branch 'PHP-7.4'
---

1ae0b68404292a411f1918f66f0d4d859e51e5bc
diff --cc Zend/zend_gc.c
index 5209b9c69c,e1c2295d74..1064e69d6e
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@@ -1357,13 -1354,15 +1346,13 @@@ tail_call
  			if (EXPECTED(!(OBJ_FLAGS(ref) & IS_OBJ_FREE_CALLED))) {
  				int n;
  				zval *zv, *end;
 -				zval tmp;
  
 -				ZVAL_OBJ(&tmp, obj);
 -				ht = obj->handlers->get_gc(&tmp, &zv, &n);
 +				ht = obj->handlers->get_gc(obj, &zv, &n);
  				end = zv + n;
  				if (EXPECTED(!ht)) {
- 					if (!n) return;
+ 					if (!n) return count;
  					while (!Z_REFCOUNTED_P(--end)) {
- 						if (zv == end) return;
+ 						if (zv == end) return count;
  					}
  				}
  				while (zv != end) {