From f7e07256283cc080b2720ee6587b96d92ef6f9e5 Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Mon, 26 Sep 2016 19:47:37 +0000 Subject: Fix serialization of Python breakpoint commands. CommandData breakpoint commands didn't know whether they were Python or Command line commands, so they couldn't serialize & deserialize themselves properly. Fix that. I also changed the "breakpoint list" command to note in the output when the commands are Python commands. Fortunately only one test was relying on this explicit bit of text output. llvm-svn: 282432 --- .../ScriptInterpreter/Python/ScriptInterpreterPython.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h index fa12bf81988e..7b0e1b000d6f 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h @@ -25,6 +25,7 @@ // Other libraries and framework includes // Project includes #include "PythonDataObjects.h" +#include "lldb/Breakpoint/BreakpointOptions.h" #include "lldb/Core/IOHandler.h" #include "lldb/Host/Terminal.h" #include "lldb/Interpreter/ScriptInterpreter.h" @@ -37,6 +38,13 @@ namespace lldb_private { class ScriptInterpreterPython : public ScriptInterpreter, public IOHandlerDelegateMultiline { public: + class CommandDataPython : public BreakpointOptions::CommandData { + public: + CommandDataPython() : BreakpointOptions::CommandData() { + interpreter = lldb::eScriptLanguagePython; + } + }; + #if PY_MAJOR_VERSION >= 3 typedef PyObject *(*SWIGInitCallback)(void); #else @@ -362,6 +370,11 @@ public: void SetBreakpointCommandCallbackFunction(BreakpointOptions *bp_options, const char *function_name) override; + /// This one is for deserialization: + Error SetBreakpointCommandCallback( + BreakpointOptions *bp_options, + std::unique_ptr &data_up) override; + /// Set a one-liner as the callback for the watchpoint. void SetWatchpointCommandCallback(WatchpointOptions *wp_options, const char *oneliner) override; -- cgit v1.2.3