5435029fbe
* libcxx-use-shlex-quote.patch * libcxx-remove-unused-imports.patch * lldb-support-python-3.13.patch * use-shlex-quote.patch OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm15?expand=0&rev=44
88 lines
3.4 KiB
Diff
88 lines
3.4 KiB
Diff
Index: lldb-15.0.7.src/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
|
|
===================================================================
|
|
--- lldb-15.0.7.src.orig/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
|
|
+++ lldb-15.0.7.src/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
|
|
@@ -71,10 +71,12 @@ Expected<std::string> python::As<std::st
|
|
}
|
|
|
|
static bool python_is_finalizing() {
|
|
-#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7
|
|
- return _Py_Finalizing != nullptr;
|
|
-#else
|
|
+#if PY_VERSION_HEX >= 0x030d0000
|
|
+ return Py_IsFinalizing();
|
|
+#elif PY_VERSION_HEX >= 0x03070000
|
|
return _Py_IsFinalizing();
|
|
+#else
|
|
+ return _Py_Finalizing != nullptr;
|
|
#endif
|
|
}
|
|
|
|
@@ -772,7 +774,7 @@ bool PythonCallable::Check(PyObject *py_
|
|
return PyCallable_Check(py_obj);
|
|
}
|
|
|
|
-#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 3
|
|
+#if PY_VERSION_HEX >= 0x03030000
|
|
static const char get_arg_info_script[] = R"(
|
|
from inspect import signature, Parameter, ismethod
|
|
from collections import namedtuple
|
|
@@ -801,7 +803,7 @@ Expected<PythonCallable::ArgInfo> Python
|
|
if (!IsValid())
|
|
return nullDeref();
|
|
|
|
-#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 3
|
|
+#if PY_VERSION_HEX >= 0x03030000
|
|
|
|
// no need to synchronize access to this global, we already have the GIL
|
|
static PythonScript get_arg_info(get_arg_info_script);
|
|
Index: lldb-15.0.7.src/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
|
===================================================================
|
|
--- lldb-15.0.7.src.orig/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
|
+++ lldb-15.0.7.src/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
|
@@ -69,8 +69,7 @@ extern "C" PyObject *PyInit__lldb(void);
|
|
#define LLDB_USE_PYTHON_SET_INTERRUPT 0
|
|
#else
|
|
// PyErr_SetInterrupt was introduced in 3.2.
|
|
-#define LLDB_USE_PYTHON_SET_INTERRUPT \
|
|
- (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2) || (PY_MAJOR_VERSION > 3)
|
|
+#define LLDB_USE_PYTHON_SET_INTERRUPT PY_VERSION_HEX >= 0x03020000
|
|
#endif
|
|
|
|
static ScriptInterpreterPythonImpl *GetPythonInterpreter(Debugger &debugger) {
|
|
@@ -169,24 +168,33 @@ private:
|
|
// would always return `true` and `PyGILState_Ensure/Release` flow would be
|
|
// executed instead of unlocking GIL with `PyEval_SaveThread`. When
|
|
// an another thread calls `PyGILState_Ensure` it would get stuck in deadlock.
|
|
-#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) || (PY_MAJOR_VERSION > 3)
|
|
+#if PY_VERSION_HEX >= 0x03070000
|
|
// The only case we should go further and acquire the GIL: it is unlocked.
|
|
if (PyGILState_Check())
|
|
return;
|
|
#endif
|
|
|
|
+// `PyEval_ThreadsInitialized` was deprecated in Python 3.9 and removed in
|
|
+// Python 3.13. It has been returning `true` always since Python 3.7.
|
|
+#if PY_VERSION_HEX < 0x03090000
|
|
if (PyEval_ThreadsInitialized()) {
|
|
+#endif
|
|
Log *log = GetLog(LLDBLog::Script);
|
|
|
|
m_was_already_initialized = true;
|
|
m_gil_state = PyGILState_Ensure();
|
|
LLDB_LOGV(log, "Ensured PyGILState. Previous state = {0}locked\n",
|
|
m_gil_state == PyGILState_UNLOCKED ? "un" : "");
|
|
+
|
|
+// `PyEval_InitThreads` was deprecated in Python 3.9 and removed in
|
|
+// Python 3.13.
|
|
+#if PY_VERSION_HEX < 0x03090000
|
|
return;
|
|
}
|
|
|
|
// InitThreads acquires the GIL if it hasn't been called before.
|
|
PyEval_InitThreads();
|
|
+#endif
|
|
}
|
|
|
|
PyGILState_STATE m_gil_state = PyGILState_UNLOCKED;
|