Merge branch 'PHP-7.4'

Author: nikic

Zend/tests/gc_017.phpt

@@ -31,12 +31,12 @@ $a->insert($c);
 unset($a);
 unset($b);
 unset($c);
-var_dump(gc_collect_cycles() >= 7);
+var_dump(gc_collect_cycles());
 echo "ok\n"
 ?>
 --EXPECTF--
 string(1) "%s"
 string(1) "%s"
 string(1) "%s"
-bool(true)
+int(4)
 ok

Zend/tests/gc_033.phpt

@@ -27,4 +27,4 @@ for ($i=0; $i<9999; $i++) {
 var_dump(gc_collect_cycles());
 ?>
 --EXPECT--
-int(20001)
+int(10002)

Zend/tests/gc_041.phpt

@@ -18,10 +18,11 @@ $o->nested[] =& $o->nested;
 $o->ryat = $o;
 $x =& $o->chtg;
 unset($o);
-gc_collect_cycles();
+var_dump(gc_collect_cycles());
 var_dump($x);
 ?>
 --EXPECT--
+int(0)
 object(ryat)#1 (3) {
   ["ryat"]=>
   *RECURSION*
@@ -32,4 +33,4 @@ object(ryat)#1 (3) {
     [0]=>
     *RECURSION*
   }
-}
+}

Zend/zend_gc.c

@@ -1175,10 +1175,6 @@ static int gc_collect_white(zend_refcounted *ref, uint32_t *flags, gc_stack *sta
 					ht = NULL;
 					if (!n) goto next;
 					while (!Z_REFCOUNTED_P(--end)) {
-						/* count non-refcounted for compatibility ??? */
-						if (Z_TYPE_P(zv) != IS_UNDEF) {
-							count++;
-						}
 						if (zv == end) goto next;
 					}
 				} else {
@@ -1192,9 +1188,6 @@ static int gc_collect_white(zend_refcounted *ref, uint32_t *flags, gc_stack *sta
 							GC_REF_SET_BLACK(ref);
 							GC_STACK_PUSH(ref);
 						}
-					/* count non-refcounted for compatibility ??? */
-					} else if (Z_TYPE_P(zv) != IS_UNDEF) {
-						count++;
 					}
 					zv++;
 				}
@@ -1242,10 +1235,6 @@ static int gc_collect_white(zend_refcounted *ref, uint32_t *flags, gc_stack *sta
 			if (Z_REFCOUNTED_P(zv)) {
 				break;
 			}
-			/* count non-refcounted for compatibility ??? */
-			if (Z_TYPE_P(zv) != IS_UNDEF) {
-				count++;
-			}
 			if (p == end) goto next;
 		}
 		while (p != end) {
@@ -1260,9 +1249,6 @@ static int gc_collect_white(zend_refcounted *ref, uint32_t *flags, gc_stack *sta
 					GC_REF_SET_BLACK(ref);
 					GC_STACK_PUSH(ref);
 				}
-				/* count non-refcounted for compatibility ??? */
-			} else if (Z_TYPE_P(zv) != IS_UNDEF) {
-				count++;
 			}
 			p++;
 		}
@@ -1324,11 +1310,12 @@ static int gc_collect_roots(uint32_t *flags, gc_stack *stack)
 	return count;
 }
 
-static void gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buffer *root)
+static int gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buffer *root)
 {
 	HashTable *ht = NULL;
 	Bucket *p, *end;
 	zval *zv;
+	int count = 0;
 
 tail_call:
 	do {
@@ -1337,18 +1324,20 @@ static void gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buff
 			gc_remove_from_roots(root);
 			GC_REF_SET_INFO(ref, 0);
 			root = NULL;
+			count++;
 		} else if (GC_REF_ADDRESS(ref) != 0
 		 && GC_REF_CHECK_COLOR(ref, GC_BLACK)) {
 			GC_TRACE_REF(ref, "removing from buffer");
 			GC_REMOVE_FROM_BUFFER(ref);
+			count++;
 		} else if (GC_TYPE(ref) == IS_REFERENCE) {
 			if (Z_REFCOUNTED(((zend_reference*)ref)->val)) {
 				ref = Z_COUNTED(((zend_reference*)ref)->val);
 				goto tail_call;
 			}
-			return;
+			return count;
 		} else {
-			return;
+			return count;
 		}
 
 		if (GC_TYPE(ref) == IS_OBJECT) {
@@ -1361,15 +1350,15 @@ static void gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buff
 				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) {
 					if (Z_REFCOUNTED_P(zv)) {
 						ref = Z_COUNTED_P(zv);
-						gc_remove_nested_data_from_buffer(ref, NULL);
+						count += gc_remove_nested_data_from_buffer(ref, NULL);
 					}
 					zv++;
 				}
@@ -1378,15 +1367,15 @@ static void gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buff
 					goto tail_call;
 				}
 			} else {
-				return;
+				return count;
 			}
 		} else if (GC_TYPE(ref) == IS_ARRAY) {
 			ht = (zend_array*)ref;
 		} else {
-			return;
+			return count;
 		}
 
-		if (!ht->nNumUsed) return;
+		if (!ht->nNumUsed) return count;
 		p = ht->arData;
 		end = p + ht->nNumUsed;
 		while (1) {
@@ -1398,7 +1387,7 @@ static void gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buff
 			if (Z_REFCOUNTED_P(zv)) {
 				break;
 			}
-			if (p == end) return;
+			if (p == end) return count;
 		}
 		while (p != end) {
 			zv = &p->val;
@@ -1407,7 +1396,7 @@ static void gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buff
 			}
 			if (Z_REFCOUNTED_P(zv)) {
 				ref = Z_COUNTED_P(zv);
-				gc_remove_nested_data_from_buffer(ref, NULL);
+				count += gc_remove_nested_data_from_buffer(ref, NULL);
 			}
 			p++;
 		}
@@ -1514,7 +1503,7 @@ ZEND_API int zend_gc_collect_cycles(void)
 				if (GC_IS_GARBAGE(current->ref)) {
 					p = GC_GET_PTR(current->ref);
 					if (GC_REFCOUNT(p) > refcounts[idx]) {
-						gc_remove_nested_data_from_buffer(p, current);
+						count -= gc_remove_nested_data_from_buffer(p, current);
 					}
 				}
 				current++;