From ad623a813e6d9ffdef62270656245b35ffceda37 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Mon, 4 Aug 2025 10:44:32 -0700 Subject: [lldb] Eliminate PyGILState_Check (NFC) (#152006) Eliminate calls to PyGILState_Check, which is not part of the Python Limited C API. In the Locker, we can use PyGILState_Ensure directly. We could do something similar to replace the assert, but I don't think it's worth it. We don't assert that we hold the GIL anywhere else. --- .../Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index adc172c..24d604f 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -139,11 +139,12 @@ public: PyConfig_Clear(&config); // The only case we should go further and acquire the GIL: it is unlocked. - if (PyGILState_Check()) + PyGILState_STATE gil_state = PyGILState_Ensure(); + if (gil_state != PyGILState_UNLOCKED) return; m_was_already_initialized = true; - m_gil_state = PyGILState_Ensure(); + m_gil_state = gil_state; LLDB_LOGV(GetLog(LLDBLog::Script), "Ensured PyGILState. Previous state = {0}", m_gil_state == PyGILState_UNLOCKED ? "unlocked" : "locked"); -- cgit v1.1