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