diff options
author | Kevin Enderby <enderby@apple.com> | 2016-06-24 22:38:30 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2016-06-24 22:38:30 +0000 |
commit | cf2cc47aa36069bbe7fda48fcbb902d1091cf99d (patch) | |
tree | c2e5745ecce16417965b3237c665ed6d48b825e1 /lib/ExecutionEngine/IntelJITEvents | |
parent | 3cc072135db0aad622495e90a40b6eea5a7ae4c8 (diff) |
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
Diffstat (limited to 'lib/ExecutionEngine/IntelJITEvents')
-rw-r--r-- | lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp | 7 |
1 files 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; |