Skip to content

GH-131288: use _AddressOfReturnAddress in _Py_get_machine_stack_pointer to silence MSVC warning in pycore_ceval.h for release builds #131289

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
merged 3 commits into from
Apr 4, 2025
Merged

GH-131288: use _AddressOfReturnAddress in _Py_get_machine_stack_pointer to silence MSVC warning in pycore_ceval.h for release builds #131289

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f89d3bc
silence warning in pycore_ceval.h
chris-eibl Mar 15, 2025
8f0d65f
use _AddressOfReturnAddress
chris-eibl Mar 15, 2025
66f5bc5
Merge branch 'main' into fix_warning_pycore_ceval
colesbury Mar 15, 2025
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
7 changes: 7 additions & 0 deletions Include/internal/pycore_ceval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ static uintptr_t return_pointer_as_int(char* p) {
}
#endif

#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4172)
#endif
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use _AddressOfReturnAddress and avoid the UB on Windows?

https://learn.microsoft.com/en-us/cpp/intrinsics/addressofreturnaddress?view=msvc-170

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great - even better!

See https://godbolt.org/z/7c9Gq9jzM, that should work out?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it works on Windows arm64 too.

static inline uintptr_t
_Py_get_machine_stack_pointer(void) {
#if _Py__has_builtin(__builtin_frame_address)
Expand All @@ -209,6 +213,9 @@ _Py_get_machine_stack_pointer(void) {
return return_pointer_as_int(&here);
#endif
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

static inline int _Py_MakeRecCheck(PyThreadState *tstate) {
uintptr_t here_addr = _Py_get_machine_stack_pointer();
Expand Down
Loading