diff options
Diffstat (limited to 'lldb/source/Interpreter/CommandInterpreter.cpp')
| -rw-r--r-- | lldb/source/Interpreter/CommandInterpreter.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index 4aee2e4..49c93a7 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -1501,8 +1501,7 @@ CommandObject *CommandInterpreter::GetCommandObjectForCommand( else if (cmd_obj->IsMultiwordObject()) { // Our current object is a multi-word object; see if the cmd_word is a // valid sub-command for our object. - CommandObject *sub_cmd_obj = - cmd_obj->GetSubcommandObject(cmd_word.c_str()); + CommandObject *sub_cmd_obj = cmd_obj->GetSubcommandObject(cmd_word); if (sub_cmd_obj) cmd_obj = sub_cmd_obj; else // cmd_word was not a valid sub-command word, so we are done @@ -1766,9 +1765,8 @@ Status CommandInterpreter::PreprocessCommand(std::string &command) { options.SetTryAllThreads(true); options.SetTimeout(std::nullopt); - ExpressionResults expr_result = - target.EvaluateExpression(expr_str.c_str(), exe_ctx.GetFramePtr(), - expr_result_valobj_sp, options); + ExpressionResults expr_result = target.EvaluateExpression( + expr_str, exe_ctx.GetFramePtr(), expr_result_valobj_sp, options); if (expr_result == eExpressionCompleted) { Scalar scalar; @@ -3410,8 +3408,7 @@ CommandInterpreter::ResolveCommandImpl(std::string &command_line, } } else { if (cmd_obj->IsMultiwordObject()) { - CommandObject *sub_cmd_obj = - cmd_obj->GetSubcommandObject(next_word.c_str()); + CommandObject *sub_cmd_obj = cmd_obj->GetSubcommandObject(next_word); if (sub_cmd_obj) { // The subcommand's name includes the parent command's name, so // restart rather than append to the revised_command_line. |