Skip to content

Commit ac6ccfa

Browse files
authored
Merge pull request #6360 from medismailben/stable/20221013
[lldb/Interpreter] Fix build failures in ScriptInterpreterLua
2 parents 0b3a9bc + a471b0e commit ac6ccfa

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class IOHandlerLuaInterpreter : public IOHandlerDelegate,
111111
io_handler.GetUserData());
112112
for (BreakpointOptions &bp_options : *bp_options_vec) {
113113
Status error = m_script_interpreter.SetBreakpointCommandCallback(
114-
bp_options, data.c_str());
114+
bp_options, data.c_str(), /*is_callback=*/false);
115115
if (error.Fail())
116116
*io_handler.GetErrorStreamFileSP() << error.AsCString() << '\n';
117117
}
@@ -121,7 +121,8 @@ class IOHandlerLuaInterpreter : public IOHandlerDelegate,
121121
auto *wp_options =
122122
static_cast<WatchpointOptions *>(io_handler.GetUserData());
123123
m_script_interpreter.SetWatchpointCommandCallback(wp_options,
124-
data.c_str());
124+
data.c_str(),
125+
/*is_callback=*/false);
125126
io_handler.SetIsDone(true);
126127
} break;
127128
case eIOHandlerNone:
@@ -348,7 +349,8 @@ Status ScriptInterpreterLua::SetBreakpointCommandCallbackFunction(
348349
}
349350

350351
Status ScriptInterpreterLua::SetBreakpointCommandCallback(
351-
BreakpointOptions &bp_options, const char *command_body_text) {
352+
BreakpointOptions &bp_options, const char *command_body_text,
353+
bool is_callback) {
352354
return RegisterBreakpointCallback(bp_options, command_body_text, {});
353355
}
354356

@@ -368,7 +370,8 @@ Status ScriptInterpreterLua::RegisterBreakpointCallback(
368370
}
369371

370372
void ScriptInterpreterLua::SetWatchpointCommandCallback(
371-
WatchpointOptions *wp_options, const char *command_body_text) {
373+
WatchpointOptions *wp_options, const char *command_body_text,
374+
bool is_callback) {
372375
RegisterWatchpointCallback(wp_options, command_body_text, {});
373376
}
374377

lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ class ScriptInterpreterLua : public ScriptInterpreter {
9292
bool is_callback) override;
9393

9494
void SetWatchpointCommandCallback(WatchpointOptions *wp_options,
95-
const char *command_body_text) override;
95+
const char *command_body_text,
96+
bool is_callback) override;
9697

9798
Status SetBreakpointCommandCallbackFunction(
9899
BreakpointOptions &bp_options, const char *function_name,

0 commit comments

Comments
 (0)