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-dwp/llvm-dwp.cpp | |
| 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-dwp/llvm-dwp.cpp')
| -rw-r--r-- | llvm/tools/llvm-dwp/llvm-dwp.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/tools/llvm-dwp/llvm-dwp.cpp b/llvm/tools/llvm-dwp/llvm-dwp.cpp index 2d6bd7f..9715ee3 100644 --- a/llvm/tools/llvm-dwp/llvm-dwp.cpp +++ b/llvm/tools/llvm-dwp/llvm-dwp.cpp @@ -410,9 +410,10 @@ static Error handleSection( if (std::error_code Err = Section.getName(Name)) return errorCodeToError(Err); - StringRef Contents; - if (auto Err = Section.getContents(Contents)) - return errorCodeToError(Err); + Expected<StringRef> ContentsOrErr = Section.getContents(); + if (!ContentsOrErr) + return ContentsOrErr.takeError(); + StringRef Contents = *ContentsOrErr; if (auto Err = handleCompressedSection(UncompressedSections, Name, Contents)) return Err; |