caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modernize FormatBacktrace() and make portable for Python 3.

Browse Source 
llvm-svn: 253085
This commit is contained in:
Zachary Turner
2015-11-13 21:28:45 +00:00
parent 75b4be9a11
commit 2419f1d57c
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lldb/source/Plugins/ScriptInterpreter/Python/PythonExceptionState.cpp
View File

@@ -146,6 +146,7 @@ PythonExceptionState::Format() const
}
else
{
__debugbreak();
// Otherwise, append some information about why we were unable to
// obtain the backtrace.
PythonString bt_error = bt_error_state.GetValue().Str();
@@ -157,50 +158,43 @@ PythonExceptionState::Format() const
std::string
PythonExceptionState::ReadBacktrace() const
{
PythonObject traceback_module;
PythonObject stringIO_module;
PythonObject stringIO_builder;
PythonObject stringIO_buffer;
PythonObject printTB;
PythonObject printTB_args;
PythonObject printTB_result;
PythonObject stringIO_getvalue;
PythonObject printTB_string;
__debugbreak();
std::string retval("backtrace unavailable");
auto traceback_module = PythonModule::ImportModule("traceback");
#if PY_MAJOR_VERSION >= 3
auto stringIO_module = PythonModule::ImportModule("io");
#else
auto stringIO_module = PythonModule::ImportModule("StringIO");
#endif
if (!m_traceback.IsAllocated())
return retval;
traceback_module.Reset(PyRefType::Owned, PyImport_ImportModule("traceback"));
stringIO_module.Reset(PyRefType::Owned, PyImport_ImportModule("StringIO"));
if (!traceback_module.IsAllocated() || !stringIO_module.IsAllocated())
return retval;
stringIO_builder.Reset(PyRefType::Owned, PyObject_GetAttrString(stringIO_module.get(), "StringIO"));
auto stringIO_builder = stringIO_module.ResolveName<PythonCallable>("StringIO");
if (!stringIO_builder.IsAllocated())
return retval;
stringIO_buffer.Reset(PyRefType::Owned, PyObject_CallObject(stringIO_builder.get(), nullptr));
auto stringIO_buffer = stringIO_builder();
if (!stringIO_buffer.IsAllocated())
return retval;
printTB.Reset(PyRefType::Owned, PyObject_GetAttrString(traceback_module.get(), "print_tb"));
auto printTB = traceback_module.ResolveName<PythonCallable>("print_tb");
if (!printTB.IsAllocated())
return retval;
printTB_args.Reset(PyRefType::Owned, Py_BuildValue("OOO", m_traceback.get(), Py_None, stringIO_buffer.get()));
printTB_result.Reset(PyRefType::Owned, PyObject_CallObject(printTB.get(), printTB_args.get()));
stringIO_getvalue.Reset(PyRefType::Owned, PyObject_GetAttrString(stringIO_buffer.get(), "getvalue"));
auto printTB_result = printTB(m_traceback.get(), Py_None, stringIO_buffer.get());
auto stringIO_getvalue = stringIO_buffer.ResolveName<PythonCallable>("getvalue");
if (!stringIO_getvalue.IsAllocated())
return retval;
printTB_string.Reset(PyRefType::Owned, PyObject_CallObject(stringIO_getvalue.get(), nullptr));
auto printTB_string = stringIO_getvalue().AsType<PythonString>();
if (!printTB_string.IsAllocated())
return retval;
PythonString str(PyRefType::Borrowed, printTB_string.get());
llvm::StringRef string_data(str.GetString());
llvm::StringRef string_data(printTB_string.GetString());
retval.assign(string_data.data(), string_data.size());
return retval;