diff options
| author | Hans Wennborg <hans@hanshq.net> | 2019-05-16 12:08:34 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2019-05-16 12:08:34 +0000 |
| commit | 4da9ff9fcfe8987472dc894489597bd338aac85e (patch) | |
| tree | 21bc0332451ec4093db5da5255ee98577ac5926e /llvm/lib/XRay/InstrumentationMap.cpp | |
| parent | a8f88c388f75cb03bd21beb0b64f87d8a8727254 (diff) | |
| download | bcm5719-llvm-4da9ff9fcfe8987472dc894489597bd338aac85e.tar.gz bcm5719-llvm-4da9ff9fcfe8987472dc894489597bd338aac85e.zip | |
Revert r360876 "[Object] Change object::SectionRef::getContents() to return Expected<StringRef>"
It broke the Clang build, see llvm-commits thread.
> Expected<ArrayRef<uint8_t>> may be better but use Expected<StringRef> for now.
>
> Follow-up of D61781.
llvm-svn: 360878
Diffstat (limited to 'llvm/lib/XRay/InstrumentationMap.cpp')
| -rw-r--r-- | llvm/lib/XRay/InstrumentationMap.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/XRay/InstrumentationMap.cpp b/llvm/lib/XRay/InstrumentationMap.cpp index 2eeb4559021..862949f578c 100644 --- a/llvm/lib/XRay/InstrumentationMap.cpp +++ b/llvm/lib/XRay/InstrumentationMap.cpp @@ -78,10 +78,9 @@ loadObj(StringRef Filename, object::OwningBinary<object::ObjectFile> &ObjFile, "Failed to find XRay instrumentation map.", std::make_error_code(std::errc::executable_format_error)); - if (Expected<StringRef> E = I->getContents()) - Contents = *E; - else - return E.takeError(); + if (I->getContents(Contents)) + return errorCodeToError( + std::make_error_code(std::errc::executable_format_error)); RelocMap Relocs; if (ObjFile.getBinary()->isELF()) { |
