mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-24 20:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.14] GH-134291: Support older macOS deployment targets for JIT builds (GH-137211) (#137701)

Browse source 
Co-authored-by: Brandt Bucher <brandtbucher@microsoft.com>
This commit is contained in:
Ned Deily 2025-08-13 06:37:01 -04:00 • committed by GitHub
parent ccb6de37d3
commit 2392232ec4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/jit.yml vendored
View file

@ -113,6 +113,10 @@ jobs:
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
brew install llvm@${{ matrix.llvm }} brew install llvm@${{ matrix.llvm }}
export SDKROOT="$(xcrun --show-sdk-path)" export SDKROOT="$(xcrun --show-sdk-path)"
# Set MACOSX_DEPLOYMENT_TARGET and -Werror=unguarded-availability to
# make sure we don't break downstream distributors (like uv):
export CFLAGS_JIT='-Werror=unguarded-availability'
export MACOSX_DEPLOYMENT_TARGET=10.15
./configure --enable-experimental-jit --enable-universalsdk --with-universal-archs=universal2 ${{ matrix.debug && '--with-pydebug' || '' }} ./configure --enable-experimental-jit --enable-universalsdk --with-universal-archs=universal2 ${{ matrix.debug && '--with-pydebug' || '' }}
make all --jobs 4 make all --jobs 4
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3

2
Misc/NEWS.d/next/Core_and_Builtins/2025-07-28-19-11-34.gh-issue-134291.IiB9Id.rst Normal file
View file

@ -0,0 +1,2 @@
Remove some newer macOS API usage from the JIT compiler in order to restore
compatibility with older OSX 10.15 deployment targets.

15
Python/jit.c
View file

@ -69,10 +69,6 @@ jit_alloc(size_t size)
#else #else
int flags = MAP_ANONYMOUS | MAP_PRIVATE; int flags = MAP_ANONYMOUS | MAP_PRIVATE;
int prot = PROT_READ | PROT_WRITE; int prot = PROT_READ | PROT_WRITE;
# ifdef MAP_JIT
flags |= MAP_JIT;
prot |= PROT_EXEC;
# endif
unsigned char *memory = mmap(NULL, size, prot, flags, -1, 0); unsigned char *memory = mmap(NULL, size, prot, flags, -1, 0);
int failed = memory == MAP_FAILED; int failed = memory == MAP_FAILED;
#endif #endif
@ -118,11 +114,8 @@ mark_executable(unsigned char *memory, size_t size)
int old; int old;
int failed = !VirtualProtect(memory, size, PAGE_EXECUTE_READ, &old); int failed = !VirtualProtect(memory, size, PAGE_EXECUTE_READ, &old);
#else #else
int failed = 0;
__builtin___clear_cache((char *)memory, (char *)memory + size); __builtin___clear_cache((char *)memory, (char *)memory + size);
#ifndef MAP_JIT int failed = mprotect(memory, size, PROT_EXEC | PROT_READ);
failed = mprotect(memory, size, PROT_EXEC | PROT_READ);
#endif
#endif #endif
if (failed) { if (failed) {
jit_error("unable to protect executable memory"); jit_error("unable to protect executable memory");
@ -528,9 +521,6 @@ _PyJIT_Compile(_PyExecutorObject *executor, const _PyUOpInstruction trace[], siz
if (memory == NULL) { if (memory == NULL) {
return -1; return -1;
} }
#ifdef MAP_JIT
pthread_jit_write_protect_np(0);
#endif
// Collect memory stats // Collect memory stats
OPT_STAT_ADD(jit_total_memory_size, total_size); OPT_STAT_ADD(jit_total_memory_size, total_size);
OPT_STAT_ADD(jit_code_size, code_size); OPT_STAT_ADD(jit_code_size, code_size);
@ -568,9 +558,6 @@ _PyJIT_Compile(_PyExecutorObject *executor, const _PyUOpInstruction trace[], siz
data += group->data_size; data += group->data_size;
assert(code == memory + code_size); assert(code == memory + code_size);
assert(data == memory + code_size + state.trampolines.size + data_size); assert(data == memory + code_size + state.trampolines.size + data_size);
#ifdef MAP_JIT
pthread_jit_write_protect_np(1);
#endif
if (mark_executable(memory, total_size)) { if (mark_executable(memory, total_size)) {
jit_free(memory, total_size); jit_free(memory, total_size);
return -1; return -1;