Skip to content

GH-126910: Make _Py_get_machine_stack_pointer return the actual stack pointer #149103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markshannon merged 7 commits into from
May 26, 2026
Merged

GH-126910: Make _Py_get_machine_stack_pointer return the actual stack pointer #149103

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d04a59
Make `_Py_get_machine_stack_pointer` return the stack pointer (or som…
markshannon Apr 28, 2026
a5765b4
Use simpler #ifdefs for selecting architecture on Windows
markshannon Apr 29, 2026
01fe604
Get esp for stack pointer on 32 bit Windows x86
markshannon Apr 29, 2026
98073f5
Merge branch 'main' into use-real-stack-pointer
markshannon May 6, 2026
c971274
Make sure frame pointer is used in PyEval_EvalDefault()
markshannon May 18, 2026
0d3a7fb
Merge branch 'main' into use-real-stack-pointer
markshannon May 21, 2026
5418bf1
Fix whitespace
markshannon May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use simpler #ifdefs for selecting architecture on Windows
  • Loading branch information
@markshannon
markshannon committed Apr 29, 2026
commit a5765b433f59ba235fd1ba47659c5238ba5a04e3
4 changes: 2 additions & 2 deletions Include/internal/pycore_pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,9 @@
static inline uintptr_t
_Py_get_machine_stack_pointer(void) {
uintptr_t result;
#if !defined(_MSC_VER) && defined(_M_ARM64)
#if defined(_M_ARM64)
result = __getReg(31);
#elif defined(_MSC_VER) && defined(_M_X64)
#elif defined(_M_X64)
result = (uintptr_t)_AddressOfReturnAddress();
#elif defined(__aarch64__)
__asm__ ("mov %0, sp" : "=r" (result));
Expand All @@ -327,7 +327,7 @@
char here;
result = (uintptr_t)&here;
#endif
return result;

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, tail-call) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 330 in Include/internal/pycore_pystate.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64, switch-case) 

returning address of local variable or temporary : here [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]
}

static inline intptr_t
Expand Down
Loading