From: David Majnemer <david.majnemer@gmail.com>
Date: Tue, 31 May 2016 01:24:33 +0000 (+0000)
Subject: [llvm-dwarfdump-fuzzer] Get this compiling again
X-Git-Tag: android-x86-7.1-r4~32553
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=84d13f89fd91946263445f6fd6be44daabed2cb3;p=android-x86%2Fexternal-llvm.git

[llvm-dwarfdump-fuzzer] Get this compiling again

Looks like the dwarfdump fuzzer has bitrotted, update it to take into
account updates to the libobject API.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@271242 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-dwarfdump/fuzzer/llvm-dwarfdump-fuzzer.cpp b/tools/llvm-dwarfdump/fuzzer/llvm-dwarfdump-fuzzer.cpp
index af0ac365228..32e173f9d1f 100644
--- a/tools/llvm-dwarfdump/fuzzer/llvm-dwarfdump-fuzzer.cpp
+++ b/tools/llvm-dwarfdump/fuzzer/llvm-dwarfdump-fuzzer.cpp
@@ -24,10 +24,12 @@ extern "C" void LLVMFuzzerTestOneInput(uint8_t *data, size_t size) {
   std::unique_ptr<MemoryBuffer> Buff = MemoryBuffer::getMemBuffer(
       StringRef((const char *)data, size), "", false);
 
-  ErrorOr<std::unique_ptr<ObjectFile>> ObjOrErr =
+  Expected<std::unique_ptr<ObjectFile>> ObjOrErr =
       ObjectFile::createObjectFile(Buff->getMemBufferRef());
-  if (!ObjOrErr)
+  if (auto E = ObjOrErr.takeError()) {
+    consumeError(std::move(E));
     return;
+  }
   ObjectFile &Obj = *ObjOrErr.get();
   std::unique_ptr<DIContext> DICtx(new DWARFContextInMemory(Obj));
   DICtx->dump(nulls(), DIDT_All);