diff options
author | Fangrui Song <maskray@google.com> | 2019-05-16 13:24:04 +0000 |
---|---|---|
committer | Fangrui Song <maskray@google.com> | 2019-05-16 13:24:04 +0000 |
commit | e183340c29db62e3c93c59c403984ad675d72c83 (patch) | |
tree | 21ec750631cf5febc8acfa3d2d6b35fc72538e96 /llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | |
parent | 1b93a24c297117c455a126f1c3e858fefe410c2f (diff) | |
download | bcm5719-llvm-e183340c29db62e3c93c59c403984ad675d72c83.tar.gz bcm5719-llvm-e183340c29db62e3c93c59c403984ad675d72c83.zip |
Recommit [Object] Change object::SectionRef::getContents() to return Expected<StringRef>
r360876 didn't fix 2 call sites in clang.
Expected<ArrayRef<uint8_t>> may be better but use Expected<StringRef> for now.
Follow-up of D61781.
llvm-svn: 360892
Diffstat (limited to 'llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp')
-rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp index 2fd677ab13a..f99868db443 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -792,8 +792,10 @@ RuntimeDyldImpl::emitSection(const ObjectFile &Obj, if (!IsVirtual && !IsZeroInit) { // In either case, set the location of the unrelocated section in memory, // since we still process relocations for it even if we're not applying them. - if (auto EC = Section.getContents(data)) - return errorCodeToError(EC); + if (Expected<StringRef> E = Section.getContents()) + data = *E; + else + return E.takeError(); pData = data.data(); } |