diff options
| author | Fangrui Song <maskray@google.com> | 2019-05-16 11:33:48 +0000 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2019-05-16 11:33:48 +0000 |
| commit | a076ec54bee20c423cf710ea2818d01df84e28b0 (patch) | |
| tree | 9349552e719590d0d902eb3e688645141e47d9e3 /llvm/lib/ExecutionEngine/RuntimeDyld | |
| parent | 671fc5f3f44986f7d20c3fcf2126cfad39b1adaf (diff) | |
| download | bcm5719-llvm-a076ec54bee20c423cf710ea2818d01df84e28b0.tar.gz bcm5719-llvm-a076ec54bee20c423cf710ea2818d01df84e28b0.zip | |
[Object] Change object::SectionRef::getContents() to return Expected<StringRef>
Expected<ArrayRef<uint8_t>> may be better but use Expected<StringRef> for now.
Follow-up of D61781.
llvm-svn: 360876
Diffstat (limited to 'llvm/lib/ExecutionEngine/RuntimeDyld')
| -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(); } |
