Merge llvm trunk r238337 from ^/vendor/llvm/dist, resolve conflicts, and

preserve our customizations, where necessary.

1 files changed, 43 insertions, 0 deletions

diff --git a/contrib/llvm/tools/llvm-cxxdump/Error.cpp b/contrib/llvm/tools/llvm-cxxdump/Error.cpp
new file mode 100644
index 0000000..16fed96
--- /dev/null
+++ b/contrib/llvm/tools/llvm-cxxdump/Error.cpp
@@ -0,0 +1,43 @@
+//===- Error.cxx - system_error extensions for llvm-cxxdump -----*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This defines a new error_category for the llvm-cxxdump tool.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Error.h"
+#include "llvm/Support/ErrorHandling.h"
+
+using namespace llvm;
+
+namespace {
+class cxxdump_error_category : public std::error_category {
+public:
+  const char *name() const LLVM_NOEXCEPT override { return "llvm.cxxdump"; }
+  std::string message(int ev) const override {
+    switch (static_cast<cxxdump_error>(ev)) {
+    case cxxdump_error::success:
+      return "Success";
+    case cxxdump_error::file_not_found:
+      return "No such file.";
+    case cxxdump_error::unrecognized_file_format:
+      return "Unrecognized file type.";
+    }
+    llvm_unreachable(
+        "An enumerator of cxxdump_error does not have a message defined.");
+  }
+};
+} // namespace
+
+namespace llvm {
+const std::error_category &cxxdump_category() {
+  static cxxdump_error_category o;
+  return o;
+}
+} // namespace llvm