From f74cd794727dcd2b85f08f2cf59cb993d1870e1d Mon Sep 17 00:00:00 2001 From: Diego Russo Date: Fri, 18 Oct 2024 17:44:23 +0100 Subject: [PATCH] Remove if statements --- Python/jit.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/Python/jit.c b/Python/jit.c index 0a8dcd1b432b7ae..a5e031fc4e7251e 100644 --- a/Python/jit.c +++ b/Python/jit.c @@ -56,19 +56,12 @@ jit_alloc(size_t size) int flags = MEM_COMMIT | MEM_RESERVE; unsigned char *memory = VirtualAlloc(NULL, size, flags, PAGE_READWRITE); int failed = memory == NULL; -#elif defined(__APPLE__) - int flags = MAP_ANONYMOUS | MAP_PRIVATE; - int prot = PROT_READ | PROT_WRITE; - //if (pthread_jit_write_protect_supported_np()) { - if (1) { - flags |= MAP_JIT; - prot |= PROT_EXEC; - } +#elif defined(__APPLE__) && defined(__aarch64__) + int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_JIT; + int prot = PROT_READ | PROT_WRITE | PROT_EXEC; unsigned char *memory = mmap(NULL, size, prot, flags, -1, 0); int failed = memory == MAP_FAILED; - if (flags & MAP_JIT) { - pthread_jit_write_protect_np(0); - } + pthread_jit_write_protect_np(0); #else int flags = MAP_ANONYMOUS | MAP_PRIVATE; int prot = PROT_READ | PROT_WRITE; @@ -115,15 +108,10 @@ mark_executable(unsigned char *memory, size_t size) } int old; int failed = !VirtualProtect(memory, size, PAGE_EXECUTE_READ, &old); -#elif defined(__APPLE__) +#elif defined(__APPLE__) && defined(__aarch64__) int failed = 0; __builtin___clear_cache((char *)memory, (char *)memory + size); - //if (pthread_jit_write_protect_supported_np()) { - if (1) { - pthread_jit_write_protect_np(1); - } else { - failed = mprotect(memory, size, PROT_EXEC | PROT_READ); - } + pthread_jit_write_protect_np(1); #else __builtin___clear_cache((char *)memory, (char *)memory + size); int failed = mprotect(memory, size, PROT_EXEC | PROT_READ);