Commit c878380065e for php.net
commit c878380065e7babbdf42c7775262774fd4084c1d
Merge: 32803687fee 27ed48c0be9
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Thu Jan 15 16:15:29 2026 +0100
Merge branch 'PHP-8.4' of github.com:php/php-src into PHP-8.5
* 'PHP-8.4' of github.com:php/php-src:
Split the live-ranges of loop variables again (#20865)
diff --cc NEWS
index 14e4a4123df,0c4c5da48b4..b20f9b1f2e0
--- a/NEWS
+++ b/NEWS
@@@ -11,10 -7,9 +11,11 @@@ PH
function triggered by bailout in php_output_lock_error()). (timwolla)
. Fix OSS-Fuzz #471533782 (Infinite loop in GC destructor fiber). (ilutov)
. Fix OSS-Fuzz #472563272 (Borked block_pass JMP[N]Z optimization). (ilutov)
- . Fixed bug GH-GH-20914 (Internal enums can be cloned and compared). (Arnaud)
+ . Fixed bug GH-20914 (Internal enums can be cloned and compared). (Arnaud)
. Fix OSS-Fuzz #474613951 (Leaked parent property default value). (ilutov)
+ . Fixed bug GH-20895 (ReflectionProperty does not return the PHPDoc of a
+ property if it contains an attribute with a Closure). (timwolla)
+ . Fixed bug GH-20766 (Use-after-free in FE_FREE with GC interaction). (Bob)
- Date:
. Update timelib to 2022.16. (Derick)
diff --cc Zend/zend_vm_execute.h
index 810c2c7ef85,fdef3e3a1b7..0ec56ca6f93
Binary files differ
diff --cc Zend/zend_vm_opcodes.c
index 00ad38baaaf,2d57da5d06f..cbbe51fbfeb
Binary files differ
diff --cc Zend/zend_vm_opcodes.h
index 287dec375f3,9e56910c144..dae282705d5
Binary files differ
diff --cc ext/opcache/tests/opt/gh11245_2.phpt
index ade810c453b,cd5b0bd363b..74aec8d7f8a
--- a/ext/opcache/tests/opt/gh11245_2.phpt
+++ b/ext/opcache/tests/opt/gh11245_2.phpt
@@@ -33,6 -33,4 +33,6 @@@ $_main
0005 FREE T1
0006 RETURN int(1)
LIVE RANGES:
- 1: 0001 - 0005 (tmp/var)
+ 1: 0001 - 0003 (tmp/var)
+
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d