Author: Med Ismail Bennani Date: 2022-11-03T14:44:52-07:00 New Revision: cc05487a834e55659072918393f5c7490af67ed2
URL: https://github.com/llvm/llvm-project/commit/cc05487a834e55659072918393f5c7490af67ed2 DIFF: https://github.com/llvm/llvm-project/commit/cc05487a834e55659072918393f5c7490af67ed2.diff LOG: [lldb/Plugins] Cleanup error handling in Scripted{Process,Thread} (NFC) Signed-off-by: Med Ismail Bennani <medismail.benn...@gmail.com> Added: Modified: lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp lldb/source/Plugins/Process/scripted/ScriptedThread.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp index 11692cbb69d48..174c00e985595 100644 --- a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp +++ b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp @@ -411,7 +411,7 @@ ScriptedProcess::GetLoadedDynamicLibrariesInfos() { StructuredData::ArraySP loaded_images_sp = GetInterface().GetLoadedImages(); if (!loaded_images_sp || !loaded_images_sp->GetSize()) - return GetInterface().ErrorWithMessage<StructuredData::ObjectSP>( + return ScriptedInterface::ErrorWithMessage<StructuredData::ObjectSP>( LLVM_PRETTY_FUNCTION, "No loaded images.", error); ModuleList module_list; @@ -477,7 +477,7 @@ ScriptedProcess::GetLoadedDynamicLibrariesInfos() { }; if (!loaded_images_sp->ForEach(reload_image)) - return GetInterface().ErrorWithMessage<StructuredData::ObjectSP>( + return ScriptedInterface::ErrorWithMessage<StructuredData::ObjectSP>( LLVM_PRETTY_FUNCTION, "Couldn't reload all images.", error); target.ModulesDidLoad(module_list); diff --git a/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp b/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp index c655ec12ecda3..b19331b5b1082 100644 --- a/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp +++ b/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp @@ -171,9 +171,7 @@ bool ScriptedThread::LoadArtificialStackFrames() { StackFrameListSP frames = GetStackFrameList(); for (size_t idx = 0; idx < arr_size; idx++) { - StructuredData::Dictionary *dict; - if (!arr_sp->GetItemAtIndexAsDictionary(idx, dict) || !dict) return ScriptedInterface::ErrorWithMessage<bool>( LLVM_PRETTY_FUNCTION, @@ -334,11 +332,10 @@ std::shared_ptr<DynamicRegisterInfo> ScriptedThread::GetDynamicRegisterInfo() { Status error; if (!reg_info) - return GetInterface() - ->ErrorWithMessage<std::shared_ptr<DynamicRegisterInfo>>( - LLVM_PRETTY_FUNCTION, - "Failed to get scripted thread registers info.", error, - LLDBLog::Thread); + return ScriptedInterface::ErrorWithMessage< + std::shared_ptr<DynamicRegisterInfo>>( + LLVM_PRETTY_FUNCTION, "Failed to get scripted thread registers info.", + error, LLDBLog::Thread); m_register_info_sp = std::make_shared<DynamicRegisterInfo>( *reg_info, m_scripted_process.GetTarget().GetArchitecture()); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
