Revert "Try a fix"

This reverts commit bde6c5b.

Author: Fidget-Spinner

Include/internal/pycore_pystate.h

@@ -306,6 +306,12 @@ _Py_AssertHoldsTstateFunc(const char *func)
 #define _Py_AssertHoldsTstate()
 #endif
 
+#if !_Py__has_builtin(__builtin_frame_address) && !defined(__GNUC__) && !defined(_MSC_VER)
+static uintptr_t return_pointer_as_int(char* p) {
+    return (uintptr_t)p;
+}
+#endif
+
 PyAPI_DATA(uintptr_t) _Py_get_machine_stack_pointer(void);
 
 static inline intptr_t

Python/pystate.c

@@ -3287,13 +3287,15 @@ _Py_GetMainConfig(void)
     return _PyInterpreterState_GetConfig(interp);
 }
 
-static uintptr_t return_pointer_as_int(char* p) {
-    return (uintptr_t)p;
-}
-
-Py_NO_INLINE uintptr_t
+uintptr_t
 _Py_get_machine_stack_pointer(void) {
+#if _Py__has_builtin(__builtin_frame_address) || defined(__GNUC__)
+    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 */
     return return_pointer_as_int(&here);
+#endif
 }