intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-16 05:32:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb] Remove CommandReturnObject's SetError(StringRef)

Browse Source 
Replacing existing uses with AppendError.

SetError is also part of the SBI API. This remains
but instead of calling the underlying SetError it
will call AppendError.

Reviewed By: teemperor

Differential Revision: https://reviews.llvm.org/D104768
This commit is contained in:
David Spickett
2021-06-22 16:12:56 +00:00
parent 3c4dbf6ea9
commit 1b1c8e4a98
11 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Interpreter/CommandReturnObject.h
View File

@@ -132,8 +132,6 @@ public:
void SetError(const Status &error, const char *fallback_error_cstr = nullptr);
void SetError(llvm::StringRef error_cstr);
lldb::ReturnStatus GetStatus();
void SetStatus(lldb::ReturnStatus status);

2
lldb/source/API/SBCommandReturnObject.cpp
View File

@@ -363,7 +363,7 @@ void SBCommandReturnObject::SetError(const char *error_cstr) {
error_cstr);
if (error_cstr)
ref().SetError(error_cstr);
ref().AppendError(error_cstr);
}
namespace lldb_private {

12
lldb/source/Commands/CommandObjectBreakpoint.cpp
View File

@@ -1798,7 +1798,7 @@ public:
protected:
bool DoExecute(Args &command, CommandReturnObject &result) override {
if (!m_name_options.m_name.OptionWasSet()) {
result.SetError("No name option provided.");
result.AppendError("No name option provided.");
return false;
}
@@ -1812,7 +1812,7 @@ protected:
size_t num_breakpoints = breakpoints.GetSize();
if (num_breakpoints == 0) {
result.SetError("No breakpoints, cannot add names.");
result.AppendError("No breakpoints, cannot add names.");
return false;
}
@@ -1824,7 +1824,7 @@ protected:
if (result.Succeeded()) {
if (valid_bp_ids.GetSize() == 0) {
result.SetError("No breakpoints specified, cannot add names.");
result.AppendError("No breakpoints specified, cannot add names.");
return false;
}
size_t num_valid_ids = valid_bp_ids.GetSize();
@@ -1883,7 +1883,7 @@ public:
protected:
bool DoExecute(Args &command, CommandReturnObject &result) override {
if (!m_name_options.m_name.OptionWasSet()) {
result.SetError("No name option provided.");
result.AppendError("No name option provided.");
return false;
}
@@ -1897,7 +1897,7 @@ protected:
size_t num_breakpoints = breakpoints.GetSize();
if (num_breakpoints == 0) {
result.SetError("No breakpoints, cannot delete names.");
result.AppendError("No breakpoints, cannot delete names.");
return false;
}
@@ -1909,7 +1909,7 @@ protected:
if (result.Succeeded()) {
if (valid_bp_ids.GetSize() == 0) {
result.SetError("No breakpoints specified, cannot delete names.");
result.AppendError("No breakpoints specified, cannot delete names.");
return false;
}
ConstString bp_name(m_name_options.m_name.GetCurrentValue());

2
lldb/source/Commands/CommandObjectMultiword.cpp
View File

@@ -396,6 +396,6 @@ bool CommandObjectProxy::Execute(const char *args_string,
CommandObject *proxy_command = GetProxyCommandObject();
if (proxy_command)
return proxy_command->Execute(args_string, result);
result.SetError(GetUnsupportedError());
result.AppendError(GetUnsupportedError());
return false;
}

2
lldb/source/Commands/CommandObjectProcess.cpp
View File

@@ -1649,7 +1649,7 @@ public:
TraceSP trace_sp = process_sp->GetTarget().GetTrace();
if (llvm::Error err = trace_sp->Stop())
result.SetError(toString(std::move(err)));
result.AppendError(toString(std::move(err)));
else
result.SetStatus(eReturnStatusSuccessFinishResult);

7
lldb/source/Commands/CommandObjectReproducer.cpp
View File

@@ -162,7 +162,8 @@ GetLoaderFromPathOrCurrent(llvm::Optional<Loader> &loader_storage,
return loader;
// This is a soft error because this is expected to fail during capture.
result.SetError("Not specifying a reproducer is only support during replay.");
result.AppendError(
"Not specifying a reproducer is only support during replay.");
result.SetStatus(eReturnStatusSuccessFinishNoResult);
return nullptr;
}
@@ -276,7 +277,7 @@ protected:
auto &r = Reproducer::Instance();
if (!r.IsCapturing() && !r.IsReplaying()) {
result.SetError(
result.AppendError(
"forcing a crash is only supported when capturing a reproducer.");
result.SetStatus(eReturnStatusSuccessFinishNoResult);
return false;
@@ -583,7 +584,7 @@ protected:
return true;
}
case eReproducerProviderNone:
result.SetError("No valid provider specified.");
result.AppendError("No valid provider specified.");
return false;
}

6
lldb/source/Commands/CommandObjectThread.cpp
View File

@@ -1728,7 +1728,7 @@ public:
true /* condense_trivial */, m_options.m_unreported);
// If we didn't find a TID, stop here and return an error.
if (!success) {
result.SetError("Error dumping plans:");
result.AppendError("Error dumping plans:");
result.AppendError(tmp_strm.GetString());
return false;
}
@@ -1966,7 +1966,7 @@ public:
TraceSP trace_sp = process_sp->GetTarget().GetTrace();
if (llvm::Error err = trace_sp->Stop(tids))
result.SetError(toString(std::move(err)));
result.AppendError(toString(std::move(err)));
else
result.SetStatus(eReturnStatusSuccessFinishResult);
@@ -2091,7 +2091,7 @@ protected:
trace_sp->GetCursorPosition(*thread_sp)) -
m_consecutive_repetitions * count;
if (position < 0)
result.SetError("error: no more data");
result.AppendError("error: no more data");
else
trace_sp->DumpTraceInstructions(*thread_sp, result.GetOutputStream(),
count, position, m_options.m_raw);

2
lldb/source/Commands/CommandObjectTrace.cpp
View File

@@ -251,7 +251,7 @@ protected:
bool DoExecute(Args &command, CommandReturnObject &result) override {
Status error;
if (command.empty()) {
result.SetError(
result.AppendError(
"trace schema cannot be invoked without a plug-in as argument");
return false;
}

2
lldb/source/Commands/CommandObjectType.cpp
View File

@@ -2744,7 +2744,7 @@ public:
bool DoExecute(llvm::StringRef raw_command_line,
CommandReturnObject &result) override {
if (raw_command_line.empty()) {
result.SetError(
result.AppendError(
"type lookup cannot be invoked without a type name as argument");
return false;
}

2
lldb/source/Interpreter/CommandObject.cpp
View File

@@ -256,7 +256,7 @@ bool CommandObject::CheckRequirements(CommandReturnObject &result) {
if (GetFlags().Test(eCommandProcessMustBeTraced)) {
Target *target = m_exe_ctx.GetTargetPtr();
if (target && !target->GetTrace()) {
result.SetError("Process is not being traced.");
result.AppendError("Process is not being traced.");
return false;
}
}

7
lldb/source/Interpreter/CommandReturnObject.cpp
View File

@@ -106,12 +106,7 @@ void CommandReturnObject::AppendError(llvm::StringRef in_string) {
void CommandReturnObject::SetError(const Status &error,
const char *fallback_error_cstr) {
assert(error.Fail() && "Expected a failed Status");
SetError(error.AsCString(fallback_error_cstr));
}
void CommandReturnObject::SetError(llvm::StringRef error_str) {
SetStatus(eReturnStatusFailed);
AppendError(error_str);
AppendError(error.AsCString(fallback_error_cstr));
}
// Similar to AppendError, but do not prepend 'Status: ' to message, and don't