From df392b518b7e187f72c036a611feca75ea8b796b Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Fri, 1 Aug 2025 15:27:14 -0700 Subject: [lldb] Reimplment PyRun_String using the Python stable C API (#151761) Reimplement `PyRun_String` using `Py_CompileString` and` PyEval_EvalCode`, which are part of the stable C API. Part of #151617 --- .../ScriptInterpreter/Python/PythonDataObjects.cpp | 41 ++++++++++++++++------ 1 file changed, 30 insertions(+), 11 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp index 98c9b61..9fe2824 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp @@ -498,9 +498,7 @@ PythonInteger::CreateStructuredSignedInteger() const { // PythonBoolean -PythonBoolean::PythonBoolean(bool value) { - SetValue(value); -} +PythonBoolean::PythonBoolean(bool value) { SetValue(value); } bool PythonBoolean::Check(PyObject *py_obj) { return py_obj ? PyBool_Check(py_obj) : false; @@ -856,15 +854,15 @@ PythonObject PythonCallable::operator()() { return PythonObject(PyRefType::Owned, PyObject_CallObject(m_py_obj, nullptr)); } -PythonObject PythonCallable:: -operator()(std::initializer_list args) { +PythonObject +PythonCallable::operator()(std::initializer_list args) { PythonTuple arg_tuple(args); return PythonObject(PyRefType::Owned, PyObject_CallObject(m_py_obj, arg_tuple.get())); } -PythonObject PythonCallable:: -operator()(std::initializer_list args) { +PythonObject +PythonCallable::operator()(std::initializer_list args) { PythonTuple arg_tuple(args); return PythonObject(PyRefType::Owned, PyObject_CallObject(m_py_obj, arg_tuple.get())); @@ -1424,8 +1422,7 @@ Error PythonScript::Init() { auto builtins = PythonModule::BuiltinsModule(); if (Error error = globals.SetItem("__builtins__", builtins)) return error; - PyObject *o = - PyRun_String(script, Py_file_input, globals.get(), globals.get()); + PyObject *o = RunString(script, Py_file_input, globals.get(), globals.get()); if (!o) return exception(); Take(o); @@ -1469,11 +1466,33 @@ python::runStringMultiLine(const llvm::Twine &string, const PythonDictionary &locals) { if (!globals.IsValid() || !locals.IsValid()) return nullDeref(); - PyObject *result = PyRun_String(NullTerminated(string), Py_file_input, - globals.get(), locals.get()); + PyObject *result = RunString(NullTerminated(string), Py_file_input, + globals.get(), locals.get()); if (!result) return exception(); return Take(result); } +namespace lldb_private { +namespace python { +PyObject *RunString(const char *str, int start, PyObject *globals, + PyObject *locals) { + const char *filename = ""; + + // Compile the string into a code object. + PyObject *code = Py_CompileString(str, filename, start); + if (!code) + return nullptr; + + // Execute the code object. + PyObject *result = PyEval_EvalCode(code, globals, locals); + + // Clean up the code object. + Py_DECREF(code); + + return result; +} +} // namespace python +} // namespace lldb_private + #endif -- cgit v1.1