From: Kevin Enderby <enderby@apple.com>
Date: Fri, 24 Jun 2016 22:38:30 +0000 (+0000)
Subject: Fix lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp for r273701
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf2cc47aa36069bbe7fda48fcbb902d1091cf99d;p=llvm

Fix lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp for r273701
and the change to libObject’s getSymbolAddress() to Expected<...> .


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

diff --git a/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp b/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp
index 962e8d06397..0051c69efb7 100644
--- a/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp
+++ b/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp
@@ -130,9 +130,12 @@ void IntelJITEventListener::NotifyObjectEmitted(
       continue;
     }
 
-    ErrorOr<uint64_t> AddrOrErr = Sym.getAddress();
-    if (AddrOrErr.getError())
+    Expected<uint64_t> AddrOrErr = Sym.getAddress();
+    if (!AddrOrErr) {
+      // TODO: Actually report errors helpfully.
+      consumeError(AddrOrErr.takeError());
       continue;
+    }
     uint64_t Addr = *AddrOrErr;
     uint64_t Size = P.second;