summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilipe Cabecinhas <me@filcab.net>2012-08-28 13:59:38 +0000
committerFilipe Cabecinhas <me@filcab.net>2012-08-28 13:59:38 +0000
commitc44306f7f3e60b7c9a364bba7babd9fcb092cfd2 (patch)
tree9c1699f1aec9e54a69b4994a5a63b2390c251824
parent1e1a1dedc6c6d0ff2bc3f2054250bbebc7060106 (diff)
downloadbcm5719-llvm-c44306f7f3e60b7c9a364bba7babd9fcb092cfd2.tar.gz
bcm5719-llvm-c44306f7f3e60b7c9a364bba7babd9fcb092cfd2.zip
Fixes by Daniel Malea.
llvm-svn: 162756
-rw-r--r--lldb/lib/Makefile1
-rw-r--r--lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile
index 78d934b1dcd..02c5b95ecbb 100644
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -40,6 +40,7 @@ USEDLIBS = lldbAPI.a \
lldbPluginObjectContainerBSDArchive.a \
lldbPluginObjectFileELF.a \
lldbPluginObjectFilePECOFF.a \
+ lldbPluginOperatingSystemPython.a \
lldbPluginPlatformGDBServer.a \
lldbPluginProcessGDBRemote.a \
lldbPluginSymbolFileDWARF.a \
diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
index cf4cac5d5ac..8de0f1058e2 100644
--- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
+++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
@@ -214,12 +214,12 @@ OperatingSystemPython::CreateRegisterContextForThread (Thread *thread)
{
RegisterContextSP reg_ctx_sp;
if (!m_interpreter || !m_python_object || !thread)
- return NULL;
+ return RegisterContextSP();
auto object_sp = m_interpreter->OSPlugin_QueryForRegisterContextData (m_interpreter->MakeScriptObject(m_python_object),
thread->GetID());
if (!object_sp)
- return NULL;
+ return RegisterContextSP();
PythonDataString reg_context_data((PyObject*)object_sp->GetObject());
if (reg_context_data)
OpenPOWER on IntegriCloud