From a0dd90eb7dc318c9b3fccb9ba02e1e22fb073094 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Thu, 5 Sep 2024 12:19:31 -0700 Subject: =?UTF-8?q?[lldb]=20Make=20conversions=20from=20llvm::Error=20expl?= =?UTF-8?q?icit=20with=20Status::FromEr=E2=80=A6=20(#107163)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …ror() [NFC] --- .../ScriptInterpreter/Python/ScriptInterpreterPython.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 76f2640..63691d2 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -1110,7 +1110,7 @@ Status ScriptInterpreterPythonImpl::ExecuteMultipleLines( options.GetEnableIO(), m_debugger, /*result=*/nullptr); if (!io_redirect_or_error) - return Status(io_redirect_or_error.takeError()); + return Status::FromError(io_redirect_or_error.takeError()); ScriptInterpreterIORedirect &io_redirect = **io_redirect_or_error; @@ -1144,7 +1144,7 @@ Status ScriptInterpreterPythonImpl::ExecuteMultipleLines( E.Restore(); return error; }); - return Status(std::move(error)); + return Status::FromError(std::move(error)); } return Status(); @@ -2393,7 +2393,7 @@ bool ScriptInterpreterPythonImpl::LoadScriptingModule( exc_options.GetEnableIO(), m_debugger, /*result=*/nullptr); if (!io_redirect_or_error) { - error = io_redirect_or_error.takeError(); + error = Status::FromError(io_redirect_or_error.takeError()); return false; } @@ -2435,7 +2435,7 @@ bool ScriptInterpreterPythonImpl::LoadScriptingModule( if (extra_search_dir) { if (llvm::Error e = ExtendSysPath(extra_search_dir.GetPath())) { - error = std::move(e); + error = Status::FromError(std::move(e)); return false; } } else { @@ -2465,7 +2465,7 @@ bool ScriptInterpreterPythonImpl::LoadScriptingModule( } if (llvm::Error e = ExtendSysPath(module_file.GetDirectory().GetCString())) { - error = std::move(e); + error = Status::FromError(std::move(e)); return false; } module_name = module_file.GetFilename().GetCString(); -- cgit v1.1