Skip to content

Commit 00d9d45

Browse files
committed
changes from review
1 parent 5372a1d commit 00d9d45

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4611,6 +4611,7 @@ ZEND_EXT_API void zend_jit_unprotect(void)
46114611
#ifdef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
46124612
if (zend_write_protect) {
46134613
pthread_jit_write_protect_np(0);
4614+
return;
46144615
}
46154616
#endif
46164617
opts |= PROT_EXEC;
@@ -4644,6 +4645,7 @@ ZEND_EXT_API void zend_jit_protect(void)
46444645
#ifdef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
46454646
if (zend_write_protect) {
46464647
pthread_jit_write_protect_np(1);
4648+
return;
46474649
}
46484650
#endif
46494651
if (mprotect(dasm_buf, dasm_size, PROT_READ | PROT_EXEC) != 0) {

ext/opcache/shared_alloc_mmap.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
166166
#ifdef PROT_MAX
167167
flags |= PROT_MAX(PROT_READ | PROT_WRITE | PROT_EXEC);
168168
#endif
169+
#ifdef MAP_JIT
170+
flags |= MAP_JIT;
171+
#endif
169172
#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__))
170173
void *hint = find_prefered_mmap_base(requested_size);
171174
if (hint != MAP_FAILED) {

0 commit comments

Comments
 (0)