Author: Adrian Prantl Date: 2024-09-05T12:36:05-07:00 New Revision: 5515b086f35c2c1402234b9b94338f10fc9d16f7
URL: https://github.com/llvm/llvm-project/commit/5515b086f35c2c1402234b9b94338f10fc9d16f7 DIFF: https://github.com/llvm/llvm-project/commit/5515b086f35c2c1402234b9b94338f10fc9d16f7.diff LOG: Factor Process::ExecutionResultAsCString() into a global function (NFC) Added: Modified: lldb/include/lldb/Target/Process.h lldb/include/lldb/Utility/Status.h lldb/source/Expression/FunctionCaller.cpp lldb/source/Expression/LLVMUserExpression.cpp lldb/source/Target/Process.cpp lldb/source/Utility/Status.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h index a7de991104434d..c66cfb2c245efd 100644 --- a/lldb/include/lldb/Target/Process.h +++ b/lldb/include/lldb/Target/Process.h @@ -1296,8 +1296,6 @@ class Process : public std::enable_shared_from_this<Process>, const EvaluateExpressionOptions &options, DiagnosticManager &diagnostic_manager); - static const char *ExecutionResultAsCString(lldb::ExpressionResults result); - void GetStatus(Stream &ostrm); size_t GetThreadStatus(Stream &ostrm, bool only_threads_with_stop_reason, diff --git a/lldb/include/lldb/Utility/Status.h b/lldb/include/lldb/Utility/Status.h index 3813a3c1604700..308532e7c633dc 100644 --- a/lldb/include/lldb/Utility/Status.h +++ b/lldb/include/lldb/Utility/Status.h @@ -26,6 +26,8 @@ class raw_ostream; namespace lldb_private { +const char *ExpressionResultAsCString(lldb::ExpressionResults result); + /// \class Status Status.h "lldb/Utility/Status.h" An error handling class. /// /// This class is designed to be able to hold any error code that can be diff --git a/lldb/source/Expression/FunctionCaller.cpp b/lldb/source/Expression/FunctionCaller.cpp index 5ac2b0681ebbec..5ce0175fedf453 100644 --- a/lldb/source/Expression/FunctionCaller.cpp +++ b/lldb/source/Expression/FunctionCaller.cpp @@ -390,8 +390,7 @@ lldb::ExpressionResults FunctionCaller::ExecuteFunction( LLDB_LOGF(log, "== [FunctionCaller::ExecuteFunction] Execution of \"%s\" " "completed abnormally: %s ==", - m_name.c_str(), - Process::ExecutionResultAsCString(return_value)); + m_name.c_str(), ExpressionResultAsCString(return_value)); } else { LLDB_LOGF(log, "== [FunctionCaller::ExecuteFunction] Execution of \"%s\" " diff --git a/lldb/source/Expression/LLVMUserExpression.cpp b/lldb/source/Expression/LLVMUserExpression.cpp index b4fdfc4d1fa8ba..9e07d4a7374a78 100644 --- a/lldb/source/Expression/LLVMUserExpression.cpp +++ b/lldb/source/Expression/LLVMUserExpression.cpp @@ -235,9 +235,9 @@ LLVMUserExpression::DoExecute(DiagnosticManager &diagnostic_manager, expr_thread_id); return execution_result; } else if (execution_result != lldb::eExpressionCompleted) { - diagnostic_manager.Printf( - lldb::eSeverityError, "Couldn't execute function; result was %s", - Process::ExecutionResultAsCString(execution_result)); + diagnostic_manager.Printf(lldb::eSeverityError, + "Couldn't execute function; result was %s", + ExpressionResultAsCString(execution_result)); return execution_result; } } diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 3d7ddbe294a49c..f2a631a466b35d 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -5743,43 +5743,6 @@ Process::RunThreadPlan(ExecutionContext &exe_ctx, return return_value; } -const char *Process::ExecutionResultAsCString(ExpressionResults result) { - const char *result_name = "<unknown>"; - - switch (result) { - case eExpressionCompleted: - result_name = "eExpressionCompleted"; - break; - case eExpressionDiscarded: - result_name = "eExpressionDiscarded"; - break; - case eExpressionInterrupted: - result_name = "eExpressionInterrupted"; - break; - case eExpressionHitBreakpoint: - result_name = "eExpressionHitBreakpoint"; - break; - case eExpressionSetupError: - result_name = "eExpressionSetupError"; - break; - case eExpressionParseError: - result_name = "eExpressionParseError"; - break; - case eExpressionResultUnavailable: - result_name = "eExpressionResultUnavailable"; - break; - case eExpressionTimedOut: - result_name = "eExpressionTimedOut"; - break; - case eExpressionStoppedForDebug: - result_name = "eExpressionStoppedForDebug"; - break; - case eExpressionThreadVanished: - result_name = "eExpressionThreadVanished"; - } - return result_name; -} - void Process::GetStatus(Stream &strm) { const StateType state = GetState(); if (StateIsStoppedState(state, false)) { diff --git a/lldb/source/Utility/Status.cpp b/lldb/source/Utility/Status.cpp index 131fc662bfc0a5..40e1fbf3fab1bb 100644 --- a/lldb/source/Utility/Status.cpp +++ b/lldb/source/Utility/Status.cpp @@ -204,3 +204,29 @@ void llvm::format_provider<lldb_private::Status>::format( llvm::format_provider<llvm::StringRef>::format(error.AsCString(), OS, Options); } + +const char *lldb_private::ExpressionResultAsCString(ExpressionResults result) { + switch (result) { + case eExpressionCompleted: + return "eExpressionCompleted"; + case eExpressionDiscarded: + return "eExpressionDiscarded"; + case eExpressionInterrupted: + return "eExpressionInterrupted"; + case eExpressionHitBreakpoint: + return "eExpressionHitBreakpoint"; + case eExpressionSetupError: + return "eExpressionSetupError"; + case eExpressionParseError: + return "eExpressionParseError"; + case eExpressionResultUnavailable: + return "eExpressionResultUnavailable"; + case eExpressionTimedOut: + return "eExpressionTimedOut"; + case eExpressionStoppedForDebug: + return "eExpressionStoppedForDebug"; + case eExpressionThreadVanished: + return "eExpressionThreadVanished"; + } + return "<unknown>"; +} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
