https://github.com/python/cpython/commit/17718b0503e5d1c987253641893cab98e01f4535
commit: 17718b0503e5d1c987253641893cab98e01f4535
branch: main
author: Victor Stinner <[email protected]>
committer: pablogsal <[email protected]>
date: 2025-04-25T14:57:01Z
summary:
gh-91048: Fix _testexternalinspection.c on FreeBSD (#132945)
files:
M Modules/_testexternalinspection.c
M Python/remote_debug.h
diff --git a/Modules/_testexternalinspection.c
b/Modules/_testexternalinspection.c
index ec61007483e2ca..b43e8b2155730f 100644
--- a/Modules/_testexternalinspection.c
+++ b/Modules/_testexternalinspection.c
@@ -49,7 +49,7 @@ struct _Py_AsyncioModuleDebugOffsets {
static uintptr_t
_Py_RemoteDebug_GetAsyncioDebugAddress(proc_handle_t* handle)
{
- uintptr_t address = 0;
+ uintptr_t address;
#ifdef MS_WINDOWS
// On Windows, search for asyncio debug in executable or DLL
@@ -57,13 +57,15 @@ _Py_RemoteDebug_GetAsyncioDebugAddress(proc_handle_t*
handle)
#elif defined(__linux__)
// On Linux, search for asyncio debug in executable or DLL
address = search_linux_map_for_section(handle, "AsyncioDebug",
"_asyncio.cpython");
-#else
+#elif defined(__APPLE__) && TARGET_OS_OSX
// On macOS, try libpython first, then fall back to python
address = search_map_for_section(handle, "AsyncioDebug",
"_asyncio.cpython");
if (address == 0) {
PyErr_Clear();
address = search_map_for_section(handle, "AsyncioDebug",
"_asyncio.cpython");
}
+#else
+ address = 0;
#endif
return address;
diff --git a/Python/remote_debug.h b/Python/remote_debug.h
index ba29ec5cec7329..cb1baf799052d5 100644
--- a/Python/remote_debug.h
+++ b/Python/remote_debug.h
@@ -674,7 +674,7 @@ search_windows_map_for_section(proc_handle_t* handle, const
char* secname, const
static uintptr_t
_Py_RemoteDebug_GetPyRuntimeAddress(proc_handle_t* handle)
{
- uintptr_t address = 0;
+ uintptr_t address;
#ifdef MS_WINDOWS
// On Windows, search for 'python' in executable or DLL
@@ -690,7 +690,7 @@ _Py_RemoteDebug_GetPyRuntimeAddress(proc_handle_t* handle)
// Error out: 'python' substring covers both executable and DLL
PyErr_SetString(PyExc_RuntimeError, "Failed to find the PyRuntime
section in the process.");
}
-#else
+#elif defined(__APPLE__) && TARGET_OS_OSX
// On macOS, try libpython first, then fall back to python
address = search_map_for_section(handle, "PyRuntime", "libpython");
if (address == 0) {
@@ -698,6 +698,8 @@ _Py_RemoteDebug_GetPyRuntimeAddress(proc_handle_t* handle)
PyErr_Clear();
address = search_map_for_section(handle, "PyRuntime", "python");
}
+#else
+ address = 0;
#endif
return address;
@@ -790,4 +792,4 @@ _Py_RemoteDebug_ReadDebugOffsets(
#ifdef __cplusplus
}
-#endif
\ No newline at end of file
+#endif
_______________________________________________
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]
