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/tools/llvm-cfi-verify/lib/FileAnalysis.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/tools/llvm-cfi-verify/lib/FileAnalysis.cpp')
| -rw-r--r-- | llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp b/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp index 4bf308f87c2..ff2ce46a01d 100644 --- a/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp +++ b/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp @@ -453,11 +453,13 @@ Error FileAnalysis::parseCodeSections() { if (!Section.getName(SectionName) && SectionName == ".plt") continue; - Expected<StringRef> Contents = Section.getContents(); - if (!Contents) - return Contents.takeError(); - ArrayRef<uint8_t> SectionBytes = arrayRefFromStringRef(*Contents); + StringRef SectionContents; + if (Section.getContents(SectionContents)) + return make_error<StringError>("Failed to retrieve section contents", + inconvertibleErrorCode()); + ArrayRef<uint8_t> SectionBytes((const uint8_t *)SectionContents.data(), + Section.getSize()); parseSectionContents(SectionBytes, {Section.getAddress(), Section.getIndex()}); } |

