diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-07-25 00:48:57 -0700 |
| commit | cd81d94322a39503e4a3e87b6ee03d4fcb3465fb (patch) | |
| tree | 81b7dd2bb4370a392f31d332a566c903b5744764 /tools/llvm-dwarfdump/llvm-dwarfdump.cpp | |
| parent | 0c5f13c0c4499eaf42ab5e9e2ceabd4e20e36861 (diff) | |
| download | external_llvm-cd81d94322a39503e4a3e87b6ee03d4fcb3465fb.zip external_llvm-cd81d94322a39503e4a3e87b6ee03d4fcb3465fb.tar.gz external_llvm-cd81d94322a39503e4a3e87b6ee03d4fcb3465fb.tar.bz2 | |
Update LLVM for rebase to r212749.
Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls
Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Diffstat (limited to 'tools/llvm-dwarfdump/llvm-dwarfdump.cpp')
| -rw-r--r-- | tools/llvm-dwarfdump/llvm-dwarfdump.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp index 46ac36e..f44b0e3 100644 --- a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp @@ -25,11 +25,11 @@ #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/system_error.h" #include <algorithm> #include <cstring> #include <list> #include <string> +#include <system_error> using namespace llvm; using namespace object; @@ -66,15 +66,16 @@ DumpType("debug-dump", cl::init(DIDT_All), clEnumValEnd)); static void DumpInput(const StringRef &Filename) { - std::unique_ptr<MemoryBuffer> Buff; + ErrorOr<std::unique_ptr<MemoryBuffer>> Buff = + MemoryBuffer::getFileOrSTDIN(Filename); - if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) { - errs() << Filename << ": " << ec.message() << "\n"; + if (std::error_code EC = Buff.getError()) { + errs() << Filename << ": " << EC.message() << "\n"; return; } - ErrorOr<ObjectFile*> ObjOrErr(ObjectFile::createObjectFile(Buff.release())); - if (error_code EC = ObjOrErr.getError()) { + ErrorOr<ObjectFile *> ObjOrErr(ObjectFile::createObjectFile(Buff.get())); + if (std::error_code EC = ObjOrErr.getError()) { errs() << Filename << ": " << EC.message() << '\n'; return; } |