maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix Python 3 issues related to OS plugins. 

* lldb::tid_t was being converted incorrectly, so this is updated to use
PythonInteger instead of manual Python Native API calls.
* OSPlugin_RegisterContextData was assuming that the result of
  get_register_data was a string, when in fact it is a bytes.  So this
  method is updated to use PythonBytes to do the work.

llvm-svn: 257398
This commit is contained in:
Zachary Turner 2016-01-11 22:16:17 +00:00
parent 5a72c02be9
commit 7a76845c48
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/scripts/Python/python-typemaps.swig
View File

@ -26,15 +26,17 @@
}
%typemap(in) lldb::tid_t {
if (PyInt_Check($input))
$1 = PyInt_AsLong($input);
else if (PyLong_Check($input))
$1 = PyLong_AsLongLong($input);
else
{
PyErr_SetString(PyExc_ValueError, "Expecting an integer");
return NULL;
}
using namespace lldb_private;
if (PythonInteger::Check($input))
{
PythonInteger py_int(PyRefType::Borrowed, $input);
$1 = static_cast<lldb::tid_t>(py_int.GetInteger());
}
else
{
PyErr_SetString(PyExc_ValueError, "Expecting an integer");
return nullptr;
}
}
%typemap(typecheck) char ** {

6
lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
View File

@ -1692,10 +1692,10 @@ ScriptInterpreterPython::OSPlugin_RegisterContextData(StructuredData::ObjectSP o
PyErr_Clear();
}
assert(PythonString::Check(py_return.get()) && "get_register_data returned unknown object type!");
assert(PythonBytes::Check(py_return.get()) && "get_register_data returned unknown object type!");
PythonString result_string(PyRefType::Borrowed, py_return.get());
return result_string.CreateStructuredString();
PythonBytes result(PyRefType::Borrowed, py_return.get());
return result.CreateStructuredString();
}
StructuredData::DictionarySP