https://github.com/python/cpython/commit/20098719dffe837fb0e516fbb97336e9a8e3354f
commit: 20098719dffe837fb0e516fbb97336e9a8e3354f
branch: main
author: Chris Eibl <[email protected]>
committer: colesbury <[email protected]>
date: 2025-04-04T09:03:12-04:00
summary:
GH-131288: Use `_AddressOfReturnAddress` for MSVC in pycore_ceval.h (gh-131289)
Use `_AddressOfReturnAddress` in `_Py_get_machine_stack_pointer` to silence
MSVC warning in pycore_ceval.h for release builds.
files:
M Include/internal/pycore_ceval.h
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
index 044403a6548b50..c44f3a283e8fb6 100644
--- a/Include/internal/pycore_ceval.h
+++ b/Include/internal/pycore_ceval.h
@@ -196,7 +196,7 @@ extern void _PyEval_DeactivateOpCache(void);
/* --- _Py_EnterRecursiveCall() ----------------------------------------- */
-#if !_Py__has_builtin(__builtin_frame_address)
+#if !_Py__has_builtin(__builtin_frame_address) && !defined(_MSC_VER)
static uintptr_t return_pointer_as_int(char* p) {
return (uintptr_t)p;
}
@@ -206,6 +206,8 @@ static inline uintptr_t
_Py_get_machine_stack_pointer(void) {
#if _Py__has_builtin(__builtin_frame_address)
return (uintptr_t)__builtin_frame_address(0);
+#elif defined(_MSC_VER)
+ return (uintptr_t)_AddressOfReturnAddress();
#else
char here;
/* Avoid compiler warning about returning stack address */
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
