Author: Adrian Prantl Date: 2024-09-18T17:28:09-07:00 New Revision: 79a69cb06665859658677b9ade4a1a262490f8c1
URL: https://github.com/llvm/llvm-project/commit/79a69cb06665859658677b9ade4a1a262490f8c1 DIFF: https://github.com/llvm/llvm-project/commit/79a69cb06665859658677b9ade4a1a262490f8c1.diff LOG: Revert "[lldb] Store ECError as CloneableECError in Status" This reverts commit cf02d8bbb6dfed17081fbdbf44e2071aea1af728. Added: Modified: lldb/source/Utility/Status.cpp Removed: ################################################################################ diff --git a/lldb/source/Utility/Status.cpp b/lldb/source/Utility/Status.cpp index a659456b9b1b39..f557cb540b5655 100644 --- a/lldb/source/Utility/Status.cpp +++ b/lldb/source/Utility/Status.cpp @@ -144,19 +144,13 @@ static llvm::Error CloneError(const llvm::Error &error) { return llvm::make_error<llvm::StringError>(e.message(), e.convertToErrorCode(), true); }; - llvm::visitErrors(error, [&](const llvm::ErrorInfoBase &e) { + visitErrors(error, [&](const llvm::ErrorInfoBase &e) { result = joinErrors(std::move(result), clone(e)); }); return result; } -Status Status::FromError(llvm::Error error) { - if (error.isA<llvm::ECError>()) { - std::error_code ec = llvm::errorToErrorCode(std::move(error)); - return Status::FromError(llvm::make_error<CloneableECError>(ec)); - } - return Status(std::move(error)); -} +Status Status::FromError(llvm::Error error) { return Status(std::move(error)); } llvm::Error Status::ToError() const { return CloneError(m_error); } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
