Author: Med Ismail Bennani Date: 2022-01-24T20:25:54+01:00 New Revision: 91bb116190cdc598863a7a3fda57e431dd832449
URL: https://github.com/llvm/llvm-project/commit/91bb116190cdc598863a7a3fda57e431dd832449 DIFF: https://github.com/llvm/llvm-project/commit/91bb116190cdc598863a7a3fda57e431dd832449.diff LOG: [lldb/Interpreter] Make `ScriptedInterface::ErrorWithMessage` static (NFC) This patch changes the `ScriptedInterface::ErrorWithMessage` method to make it `static` which makes it easier to call. The patch also updates its various call sites to reflect this change. Differential Revision: https://reviews.llvm.org/D117374 Signed-off-by: Med Ismail Bennani <medismail.benn...@gmail.com> Added: Modified: lldb/include/lldb/Interpreter/ScriptedInterface.h lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Interpreter/ScriptedInterface.h b/lldb/include/lldb/Interpreter/ScriptedInterface.h index 27cf9f036e5fd..9eb11832003e6 100644 --- a/lldb/include/lldb/Interpreter/ScriptedInterface.h +++ b/lldb/include/lldb/Interpreter/ScriptedInterface.h @@ -31,9 +31,9 @@ class ScriptedInterface { StructuredData::Generic *script_obj = nullptr) = 0; template <typename Ret> - Ret ErrorWithMessage(llvm::StringRef caller_name, llvm::StringRef error_msg, - Status &error, - uint32_t log_caterogy = LIBLLDB_LOG_PROCESS) { + static Ret ErrorWithMessage(llvm::StringRef caller_name, + llvm::StringRef error_msg, Status &error, + uint32_t log_caterogy = LIBLLDB_LOG_PROCESS) { LLDB_LOGF(GetLogIfAllCategoriesSet(log_caterogy), "%s ERROR = %s", caller_name.data(), error_msg.data()); error.SetErrorString(llvm::Twine(caller_name + llvm::Twine(" ERROR = ") + diff --git a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp index e71a0fdf8de92..5eb7cb0e6a5c8 100644 --- a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp +++ b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp @@ -222,8 +222,8 @@ bool ScriptedProcess::IsAlive() { size_t ScriptedProcess::DoReadMemory(lldb::addr_t addr, void *buf, size_t size, Status &error) { if (!m_interpreter) - return GetInterface().ErrorWithMessage<size_t>(LLVM_PRETTY_FUNCTION, - "No interpreter.", error); + return ScriptedInterface::ErrorWithMessage<size_t>( + LLVM_PRETTY_FUNCTION, "No interpreter.", error); lldb::DataExtractorSP data_extractor_sp = GetInterface().ReadMemoryAtAddress(addr, size, error); @@ -235,7 +235,7 @@ size_t ScriptedProcess::DoReadMemory(lldb::addr_t addr, void *buf, size_t size, 0, data_extractor_sp->GetByteSize(), buf, size, GetByteOrder()); if (!bytes_copied || bytes_copied == LLDB_INVALID_OFFSET) - return GetInterface().ErrorWithMessage<size_t>( + return ScriptedInterface::ErrorWithMessage<size_t>( LLVM_PRETTY_FUNCTION, "Failed to copy read memory to buffer.", error); return size; @@ -293,7 +293,7 @@ bool ScriptedProcess::DoUpdateThreadList(ThreadList &old_thread_list, ScriptLanguage language = m_interpreter->GetLanguage(); if (language != eScriptLanguagePython) - return GetInterface().ErrorWithMessage<bool>( + return ScriptedInterface::ErrorWithMessage<bool>( LLVM_PRETTY_FUNCTION, llvm::Twine("ScriptInterpreter language (" + llvm::Twine(m_interpreter->LanguageToString(language)) + @@ -304,7 +304,7 @@ bool ScriptedProcess::DoUpdateThreadList(ThreadList &old_thread_list, StructuredData::DictionarySP thread_info_sp = GetInterface().GetThreadsInfo(); if (!thread_info_sp) - return GetInterface().ErrorWithMessage<bool>( + return ScriptedInterface::ErrorWithMessage<bool>( LLVM_PRETTY_FUNCTION, "Couldn't fetch thread list from Scripted Process.", error); @@ -312,13 +312,13 @@ bool ScriptedProcess::DoUpdateThreadList(ThreadList &old_thread_list, [this, &old_thread_list, &error, &new_thread_list](ConstString key, StructuredData::Object *val) -> bool { if (!val) - return GetInterface().ErrorWithMessage<bool>( + return ScriptedInterface::ErrorWithMessage<bool>( LLVM_PRETTY_FUNCTION, "Invalid thread info object", error); lldb::tid_t tid = LLDB_INVALID_THREAD_ID; if (!llvm::to_integer(key.AsCString(), tid)) - return GetInterface().ErrorWithMessage<bool>(LLVM_PRETTY_FUNCTION, - "Invalid thread id", error); + return ScriptedInterface::ErrorWithMessage<bool>( + LLVM_PRETTY_FUNCTION, "Invalid thread id", error); if (ThreadSP thread_sp = old_thread_list.FindThreadByID(tid, false /*=can_update*/)) { @@ -331,7 +331,7 @@ bool ScriptedProcess::DoUpdateThreadList(ThreadList &old_thread_list, auto thread_or_error = ScriptedThread::Create(*this, val->GetAsGeneric()); if (!thread_or_error) - return GetInterface().ErrorWithMessage<bool>( + return ScriptedInterface::ErrorWithMessage<bool>( LLVM_PRETTY_FUNCTION, toString(thread_or_error.takeError()), error); ThreadSP thread_sp = thread_or_error.get(); @@ -339,7 +339,7 @@ bool ScriptedProcess::DoUpdateThreadList(ThreadList &old_thread_list, RegisterContextSP reg_ctx_sp = thread_sp->GetRegisterContext(); if (!reg_ctx_sp) - return GetInterface().ErrorWithMessage<bool>( + return ScriptedInterface::ErrorWithMessage<bool>( LLVM_PRETTY_FUNCTION, llvm::Twine("Invalid Register Context for thread " + llvm::Twine(key.AsCString())) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
