From d8e91e46262bc44006913e6796843909f1ac7bcd Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 19 Jan 2019 10:01:25 +0000 Subject: Vendor import of llvm trunk r351319 (just before the release_80 branch point): https://llvm.org/svn/llvm-project/llvm/trunk@351319 --- lib/DebugInfo/CodeView/CodeViewError.cpp | 35 ++++++-------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) (limited to 'lib/DebugInfo/CodeView/CodeViewError.cpp') diff --git a/lib/DebugInfo/CodeView/CodeViewError.cpp b/lib/DebugInfo/CodeView/CodeViewError.cpp index 8de266b836b4..2a9753add311 100644 --- a/lib/DebugInfo/CodeView/CodeViewError.cpp +++ b/lib/DebugInfo/CodeView/CodeViewError.cpp @@ -14,25 +14,23 @@ using namespace llvm; using namespace llvm::codeview; -namespace { // FIXME: This class is only here to support the transition to llvm::Error. It // will be removed once this transition is complete. Clients should prefer to // deal with the Error value directly, rather than converting to error_code. class CodeViewErrorCategory : public std::error_category { public: const char *name() const noexcept override { return "llvm.codeview"; } - std::string message(int Condition) const override { switch (static_cast(Condition)) { case cv_error_code::unspecified: - return "An unknown error has occurred."; + return "An unknown CodeView error has occurred."; case cv_error_code::insufficient_buffer: return "The buffer is not large enough to read the requested number of " "bytes."; case cv_error_code::corrupt_record: return "The CodeView record is corrupted."; case cv_error_code::no_records: - return "There are no records"; + return "There are no records."; case cv_error_code::operation_unsupported: return "The requested operation is not supported."; case cv_error_code::unknown_member_record: @@ -41,31 +39,10 @@ public: llvm_unreachable("Unrecognized cv_error_code"); } }; -} // end anonymous namespace - -static ManagedStatic Category; - -char CodeViewError::ID = 0; - -CodeViewError::CodeViewError(cv_error_code C) : CodeViewError(C, "") {} -CodeViewError::CodeViewError(const std::string &Context) - : CodeViewError(cv_error_code::unspecified, Context) {} - -CodeViewError::CodeViewError(cv_error_code C, const std::string &Context) - : Code(C) { - ErrMsg = "CodeView Error: "; - std::error_code EC = convertToErrorCode(); - if (Code != cv_error_code::unspecified) - ErrMsg += EC.message() + " "; - if (!Context.empty()) - ErrMsg += Context; +static llvm::ManagedStatic CodeViewErrCategory; +const std::error_category &llvm::codeview::CVErrorCategory() { + return *CodeViewErrCategory; } -void CodeViewError::log(raw_ostream &OS) const { OS << ErrMsg << "\n"; } - -const std::string &CodeViewError::getErrorMessage() const { return ErrMsg; } - -std::error_code CodeViewError::convertToErrorCode() const { - return std::error_code(static_cast(Code), *Category); -} +char CodeViewError::ID; -- cgit v1.2.3