[opaque pointer type] Use pointee type retrieved from asm, rather than accessing...

[oota-llvm.git] / lib / Object / Error.cpp

diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp
index f1d0f0184d242c2f786b4c910899627954ddb174..d2daab72d589da5e4e8ff2f19f567985f47ea42e 100644 (file)
--- a/lib/Object/Error.cpp
+++ b/lib/Object/Error.cpp
@@ -13,20 +13,20 @@
 
 #include "llvm/Object/Error.h"
 #include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/ManagedStatic.h"
 
 using namespace llvm;
 using namespace object;
 
 namespace {
-class _object_error_category : public error_category {
+class _object_error_category : public std::error_category {
 public:
-  const char* name() const override;
+  const char* name() const LLVM_NOEXCEPT override;
   std::string message(int ev) const override;
-  error_condition default_error_condition(int ev) const override;
 };
 }
 
-const char *_object_error_category::name() const {
+const char *_object_error_category::name() const LLVM_NOEXCEPT {
   return "llvm.object";
 }
 
@@ -42,18 +42,15 @@ std::string _object_error_category::message(int EV) const {
     return "Invalid data was encountered while parsing the file";
   case object_error::unexpected_eof:
     return "The end of the file was unexpectedly encountered";
+  case object_error::bitcode_section_not_found:
+    return "Bitcode section not found in object file";
   }
   llvm_unreachable("An enumerator of object_error does not have a message "
                    "defined.");
 }
 
-error_condition _object_error_category::default_error_condition(int EV) const {
-  if (static_cast<object_error>(EV) == object_error::success)
-    return error_condition();
-  return errc::invalid_argument;
-}
+static ManagedStatic<_object_error_category> error_category;
 
-const error_category &object::object_category() {
-  static _object_error_category o;
-  return o;
+const std::error_category &object::object_category() {
+  return *error_category;
 }