diff options
author | Fangrui Song <maskray@google.com> | 2019-05-02 10:32:03 +0000 |
---|---|---|
committer | Fangrui Song <maskray@google.com> | 2019-05-02 10:32:03 +0000 |
commit | 8be28cdc5281edbe83886168978303345ca4a78b (patch) | |
tree | 613ac659e7c0e7384806266757e1fbf34bf418c6 /llvm/lib/Object/MachOObjectFile.cpp | |
parent | 71569d0d523465203ba465a89c37d75075a5e2c2 (diff) | |
download | bcm5719-llvm-8be28cdc5281edbe83886168978303345ca4a78b.tar.gz bcm5719-llvm-8be28cdc5281edbe83886168978303345ca4a78b.zip |
[Object] Change getSectionName() to return Expected<StringRef>
Summary:
It currently receives an output parameter and returns
std::error_code. Expected<StringRef> fits for this purpose perfectly.
Differential Revision: https://reviews.llvm.org/D61421
llvm-svn: 359774
Diffstat (limited to 'llvm/lib/Object/MachOObjectFile.cpp')
-rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 8be287c5f9e..1aa57bbbc76 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -1863,11 +1863,9 @@ void MachOObjectFile::moveSectionNext(DataRefImpl &Sec) const { Sec.d.a++; } -std::error_code MachOObjectFile::getSectionName(DataRefImpl Sec, - StringRef &Result) const { +Expected<StringRef> MachOObjectFile::getSectionName(DataRefImpl Sec) const { ArrayRef<char> Raw = getSectionRawName(Sec); - Result = parseSegmentOrSectionName(Raw.data()); - return std::error_code(); + return parseSegmentOrSectionName(Raw.data()); } uint64_t MachOObjectFile::getSectionAddress(DataRefImpl Sec) const { @@ -2000,9 +1998,8 @@ bool MachOObjectFile::isSectionVirtual(DataRefImpl Sec) const { bool MachOObjectFile::isSectionBitcode(DataRefImpl Sec) const { StringRef SegmentName = getSectionFinalSegmentName(Sec); - StringRef SectName; - if (!getSectionName(Sec, SectName)) - return (SegmentName == "__LLVM" && SectName == "__bitcode"); + if (Expected<StringRef> NameOrErr = getSectionName(Sec)) + return (SegmentName == "__LLVM" && *NameOrErr == "__bitcode"); return false; } |