From e14dc26857470f248e5fc1dd14d89314eae47fa5 Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Mon, 12 Sep 2016 23:10:56 +0000 Subject: This is the main part of a change to add breakpoint save and restore to lldb. Still to come: 1) SB API's 2) Testcases 3) Loose ends: a) serialize Thread options b) serialize Exception resolvers 4) "break list --file" should list breakpoints contained in a file and "break read -f 1 3 5" should then read in only those breakpoints. llvm-svn: 281273 --- .../ScriptInterpreter/Python/ScriptInterpreterPython.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 5806d33d0ee..3257afbba9b 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -420,7 +420,7 @@ void ScriptInterpreterPython::IOHandlerInputComplete(IOHandler &io_handler, if (GenerateBreakpointCommandCallbackData(data_ap->user_source, data_ap->script_source) .Success()) { - BatonSP baton_sp( + BreakpointOptions::CommandBatonSP baton_sp( new BreakpointOptions::CommandBaton(data_ap.release())); bp_options->SetCallback( ScriptInterpreterPython::BreakpointCallbackFunction, baton_sp); @@ -1050,11 +1050,11 @@ bool ScriptInterpreterPython::ExecuteOneLineWithReturn( } case eScriptReturnTypeCharStrOrNone: // char* or NULL if py_return == // Py_None - { - const char format[3] = "z"; - success = PyArg_Parse(py_return.get(), format, (char **)ret_value); - break; - } + { + const char format[3] = "z"; + success = PyArg_Parse(py_return.get(), format, (char **)ret_value); + break; + } case eScriptReturnTypeBool: { const char format[2] = "b"; success = PyArg_Parse(py_return.get(), format, (bool *)ret_value); @@ -1251,7 +1251,8 @@ Error ScriptInterpreterPython::SetBreakpointCommandCallback( Error error = GenerateBreakpointCommandCallbackData(data_ap->user_source, data_ap->script_source); if (error.Success()) { - BatonSP baton_sp(new BreakpointOptions::CommandBaton(data_ap.release())); + BreakpointOptions::CommandBatonSP baton_sp( + new BreakpointOptions::CommandBaton(data_ap.release())); bp_options->SetCallback(ScriptInterpreterPython::BreakpointCallbackFunction, baton_sp); return error; -- cgit v1.2.3