Skip to content

Commit 00dd02c

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Add missing clobbered registers
2 parents efc50db + 93d32ea commit 00dd02c

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.5.4
44

5+
- Core:
6+
. Fixed bug GH-21029 (zend_mm_heap corrupted on Aarch64, LTO builds). (Arnaud)
57

68
29 Jan 2026, PHP 8.5.3
79

Zend/zend_multiply.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si
255255
: "=&r"(res), "=&r"(m_overflow)
256256
: "r"(nmemb),
257257
"r"(size),
258-
"r"(offset));
258+
"r"(offset)
259+
: "cc");
259260

260261
if (UNEXPECTED(m_overflow)) {
261262
*overflow = 1;
@@ -279,7 +280,8 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si
279280
: "=&r"(res), "=&r"(m_overflow)
280281
: "r"(nmemb),
281282
"r"(size),
282-
"r"(offset));
283+
"r"(offset)
284+
: "xer");
283285

284286
if (UNEXPECTED(m_overflow)) {
285287
*overflow = 1;

0 commit comments

Comments
 (0)