Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit e98e4e39a395 · 2025-03-21T11:48:16.000+01:00
* PHP-8.3: Fixed bug phpGH-13193 again
diff --git a/NEWS b/NEWS
@@ -27,6 +27,8 @@ PHP                                                                        NEWS
   . Fixed bug GH-15367 (dl() of module with aliased class crashes in shutdown).
     (Arnaud)
   . Fixed OSS-Fuzz #403308724. (nielsdos)
+  . Fixed bug GH-13193 again (Significant performance degradation in 'foreach').
+    (nielsdos)
 
 - DBA:
   . Fixed assertion violation when opening the same file with dba_open
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
@@ -1917,7 +1917,7 @@ ZEND_API int zend_gc_collect_cycles(void)
 	bool did_rerun_gc = 0;
 
 	zend_hrtime_t start_time = zend_hrtime();
-	if (GC_G(num_roots) && GC_G(gc_active)) {
+	if (GC_G(num_roots) && !GC_G(gc_active)) {
 		zend_gc_remove_root_tmpvars();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1917,7 +1917,7 @@ ZEND_API int zend_gc_collect_cycles(void)`
`1917`	`1917`	`bool did_rerun_gc = 0;`
`1918`	`1918`
`1919`	`1919`	`zend_hrtime_t start_time = zend_hrtime();`
`1920`		`- if (GC_G(num_roots) && GC_G(gc_active)) {`
	`1920`	`+ if (GC_G(num_roots) && !GC_G(gc_active)) {`
`1921`	`1921`	`zend_gc_remove_root_tmpvars();`
`1922`	`1922`	`}`
`1923`	`1923`