Author: Vladislav Dzhidzhoev Date: 2025-04-18T22:16:35+02:00 New Revision: 058992ea9fc62a9f79ab90eaebecb267469795a7
URL: https://github.com/llvm/llvm-project/commit/058992ea9fc62a9f79ab90eaebecb267469795a7 DIFF: https://github.com/llvm/llvm-project/commit/058992ea9fc62a9f79ab90eaebecb267469795a7.diff LOG: [lldb] Fix Python GIL-not-held issue in CreateStructuredDataFromScriptObject (#136309) TestStructuredDataAPI.py fails with Python debug build ver. 3.12+ due to call to Py_XINCREF while GIL is not held. Added: Modified: lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index a9c81273c1302..553ee7e80b359 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -1569,10 +1569,10 @@ StructuredData::ObjectSP ScriptInterpreterPythonImpl::CreateStructuredDataFromScriptObject( ScriptObject obj) { void *ptr = const_cast<void *>(obj.GetPointer()); + Locker py_lock(this, Locker::AcquireLock | Locker::NoSTDIN, Locker::FreeLock); PythonObject py_obj(PyRefType::Borrowed, static_cast<PyObject *>(ptr)); if (!py_obj.IsValid() || py_obj.IsNone()) return {}; - Locker py_lock(this, Locker::AcquireLock | Locker::NoSTDIN, Locker::FreeLock); return py_obj.CreateStructuredObject(); } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits