From: Victor Stinner Date: Fri, 25 Apr 2025 14:57:01 +0000 (+0200) Subject: gh-91048: Fix _testexternalinspection.c on FreeBSD (#132945) X-Git-Tag: v3.14.0b1~286 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17718b0503e5d1c987253641893cab98e01f4535;p=thirdparty%2FPython%2Fcpython.git gh-91048: Fix _testexternalinspection.c on FreeBSD (#132945) --- diff --git a/Modules/_testexternalinspection.c b/Modules/_testexternalinspection.c index ec61007483e2..b43e8b215573 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 ba29ec5cec73..cb1baf799052 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