Author: Dave Lee Date: 2022-01-08T09:35:13-08:00 New Revision: 930f3c625e0277c4a28e66f79df7d8ad0de258e5
URL: https://github.com/llvm/llvm-project/commit/930f3c625e0277c4a28e66f79df7d8ad0de258e5 DIFF: https://github.com/llvm/llvm-project/commit/930f3c625e0277c4a28e66f79df7d8ad0de258e5.diff LOG: Revert "[lldb] Set result error state in 'frame variable'" This reverts commit 2c7d10c41278181e3e45c68f28b501cd95193a8a. Added: Modified: lldb/source/Commands/CommandObjectFrame.cpp Removed: ################################################################################ diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index 8dd1a79d38959..9cfe997f92274 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -558,16 +558,18 @@ may even involve JITing and running code in the target program.)"); } } } else if (num_matches == 0) { - result.AppendErrorWithFormat( - "no variables matched the regular expression '%s'.", - entry.c_str()); + result.GetErrorStream().Printf("error: no variables matched " + "the regular expression '%s'.\n", + entry.c_str()); } } else { if (llvm::Error err = regex.GetError()) - result.AppendError(llvm::toString(std::move(err))); + result.GetErrorStream().Printf( + "error: %s\n", llvm::toString(std::move(err)).c_str()); else - result.AppendErrorWithFormat( - "unknown regex error when compiling '%s'", entry.c_str()); + result.GetErrorStream().Printf( + "error: unknown regex error when compiling '%s'\n", + entry.c_str()); } } else // No regex, either exact variable names or variable // expressions. @@ -603,13 +605,14 @@ may even involve JITing and running code in the target program.)"); valobj_sp->GetParent() ? entry.c_str() : nullptr); valobj_sp->Dump(output_stream, options); } else { - if (auto error_cstr = error.AsCString(nullptr)) - result.AppendError(error_cstr); + const char *error_cstr = error.AsCString(nullptr); + if (error_cstr) + result.GetErrorStream().Printf("error: %s\n", error_cstr); else - result.AppendErrorWithFormat( - "unable to find any variable expression path that matches " - "'%s'.", - entry.c_str()); + result.GetErrorStream().Printf("error: unable to find any " + "variable expression path that " + "matches '%s'.\n", + entry.c_str()); } } } @@ -677,8 +680,7 @@ may even involve JITing and running code in the target program.)"); } } } - if (result.GetStatus() != eReturnStatusFailed) - result.SetStatus(eReturnStatusSuccessFinishResult); + result.SetStatus(eReturnStatusSuccessFinishResult); } if (m_option_variable.show_recognized_args) { _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
