summaryrefslogtreecommitdiffstats
path: root/lldb/scripts/Python/python-wrapper.swig
diff options
context:
space:
mode:
authorEnrico Granata <egranata@apple.com>2016-06-24 02:07:15 +0000
committerEnrico Granata <egranata@apple.com>2016-06-24 02:07:15 +0000
commita5d6765cb04214b10b5b5b550e554c5411c03b43 (patch)
tree23ea54790d247d50d16323a95ee044b9d5bbd0cf /lldb/scripts/Python/python-wrapper.swig
parent68f7f1cf00a0405446fe765d2ed6e583a6e5947b (diff)
downloadbcm5719-llvm-a5d6765cb04214b10b5b5b550e554c5411c03b43.tar.gz
bcm5719-llvm-a5d6765cb04214b10b5b5b550e554c5411c03b43.zip
Fix an issue where the @lldb.command marker would not work with the new 5-argument version of the Python command function
This: a) teaches PythonCallable to look inside a callable object b) teaches PythonCallable to discover whether a callable method is bound c) teaches lldb.command to dispatch to either the older 4 argument version or the newer 5 argument version llvm-svn: 273640
Diffstat (limited to 'lldb/scripts/Python/python-wrapper.swig')
-rw-r--r--lldb/scripts/Python/python-wrapper.swig2
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/scripts/Python/python-wrapper.swig b/lldb/scripts/Python/python-wrapper.swig
index 5d7bfaa8943..a92102e3283 100644
--- a/lldb/scripts/Python/python-wrapper.swig
+++ b/lldb/scripts/Python/python-wrapper.swig
@@ -610,7 +610,7 @@ LLDBSwigPythonCallCommand
PythonObject exe_ctx_arg(PyRefType::Owned, SBTypeToSWIGWrapper(exe_ctx_sb));
PythonObject cmd_retobj_arg(PyRefType::Owned, SBTypeToSWIGWrapper(&cmd_retobj_sb));
- if (argc.count == 5 || argc.has_varargs)
+ if (argc.count == 5 || argc.is_bound_method || argc.has_varargs)
pfunc(debugger_arg, PythonString(args), exe_ctx_arg, cmd_retobj_arg, dict);
else
pfunc(debugger_arg, PythonString(args), cmd_retobj_arg, dict);
OpenPOWER on IntegriCloud