From cf2cc47aa36069bbe7fda48fcbb902d1091cf99d Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Fri, 24 Jun 2016 22:38:30 +0000
Subject: [PATCH] =?utf8?q?Fix=20lib/ExecutionEngine/IntelJITEvents/IntelJI?=
 =?utf8?q?TEventListener.cpp=20for=20r273701=20and=20the=20change=20to=20l?=
 =?utf8?q?ibObject=E2=80=99s=20getSymbolAddress()=20to=20Expected<...>=20.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@273740 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../IntelJITEvents/IntelJITEventListener.cpp               | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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;
 
-- 
2.50.1