Skip to content

Commit ef5ca80

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Add missing cc clobber
2 parents a7fef37 + c04f2d2 commit ef5ca80

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Zend/zend_multiply.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,15 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si
155155
__asm__ ("mull %3\n\tadcl $0,%1"
156156
: "=&a"(res), "=&d" (m_overflow)
157157
: "%0"(res),
158-
"rm"(size));
158+
"rm"(size)
159+
: "cc");
159160
} else {
160161
__asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1"
161162
: "=&a"(res), "=&d" (m_overflow)
162163
: "%0"(res),
163164
"rm"(size),
164-
"rm"(offset));
165+
"rm"(offset)
166+
: "cc");
165167
}
166168

167169
if (UNEXPECTED(m_overflow)) {
@@ -191,7 +193,8 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si
191193
"adc $0,%1"
192194
: "=&a"(res), "=&d" (m_overflow)
193195
: "%0"(res),
194-
"rm"(size));
196+
"rm"(size)
197+
: "cc");
195198
} else if (ZEND_CONST_COND(nmemb == 1, 0)) {
196199
res = size;
197200
__asm__ ("add %2, %0\n\t"
@@ -207,7 +210,8 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si
207210
: "=&a"(res), "=&d" (m_overflow)
208211
: "%0"(res),
209212
"rm"(size),
210-
"rm"(offset));
213+
"rm"(offset)
214+
: "cc");
211215
}
212216
#undef LP_SUFF
213217
if (UNEXPECTED(m_overflow)) {

0 commit comments

Comments
 (0)