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 /clang/tools | |
parent | 1b93a24c297117c455a126f1c3e858fefe410c2f (diff) | |
download | bcm5719-llvm-e183340c29db62e3c93c59c403984ad675d72c83.tar.gz bcm5719-llvm-e183340c29db62e3c93c59c403984ad675d72c83.zip |
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 'clang/tools')
-rw-r--r-- | clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp index 4e7cdd6c913..0c628963a29 100644 --- a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp +++ b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp @@ -462,13 +462,16 @@ public: // TODO: Instead of copying the input file as is, deactivate the section // that is no longer needed. - StringRef Content; - CurrentSection->getContents(Content); + Expected<StringRef> Content = CurrentSection->getContents(); + if (!Content) { + consumeError(Content.takeError()); + return; + } - if (Content.size() < 2) + if (Content->size() < 2) OS.write(Input.getBufferStart(), Input.getBufferSize()); else - OS.write(Content.data(), Content.size()); + OS.write(Content->data(), Content->size()); } void WriteHeader(raw_fd_ostream &OS, |