Skip to content

Commit 46fcf33

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix crashes after opcache restart
2 parents 60cb8fe + c5364b8 commit 46fcf33

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5164,6 +5164,10 @@ ZEND_EXT_API void zend_jit_restart(void)
51645164
if (dasm_buf) {
51655165
zend_jit_unprotect();
51665166

5167+
#if ZEND_JIT_TARGET_ARM64
5168+
memset(dasm_labels_veneers, 0, sizeof(void*) * ZEND_MM_ALIGNED_SIZE_EX(zend_lb_MAX, DASM_ALIGNMENT));
5169+
#endif
5170+
51675171
/* restore JIT buffer pos */
51685172
dasm_ptr[0] = dasm_ptr[1];
51695173

0 commit comments

Comments
 (0)