diff options
| author | George Rimar <grimar@accesssoftek.com> | 2017-01-17 13:27:58 +0000 |
|---|---|---|
| committer | George Rimar <grimar@accesssoftek.com> | 2017-01-17 13:27:58 +0000 |
| commit | 715540f20740ff86706dd7437b7239e1a163769d (patch) | |
| tree | 1634e9bae417ba6f27540cc6f345a41b8ec2c2f7 /llvm/lib/MC/ELFObjectWriter.cpp | |
| parent | a2a0213179de235f0423e520b6625c696a9daff6 (diff) | |
| download | bcm5719-llvm-715540f20740ff86706dd7437b7239e1a163769d.tar.gz bcm5719-llvm-715540f20740ff86706dd7437b7239e1a163769d.zip | |
Revert r292214 "[Support/Compression] - Change zlib API to return Error instead of custom status."
It broked clang:
http://lab.llvm.org:8080/green//job/clang-stage1-cmake-RA-incremental_build/34218/consoleFull#46141505449ba4694-19c4-4d7e-bec5-911270d8a58c
llvm-svn: 292217
Diffstat (limited to 'llvm/lib/MC/ELFObjectWriter.cpp')
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 0e02cdb4ca0..a8c88dda693 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -32,7 +32,6 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/ELF.h" #include "llvm/Support/Endian.h" -#include "llvm/Support/Error.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/StringSaver.h" #include <vector> @@ -1038,10 +1037,10 @@ void ELFObjectWriter::writeSectionData(const MCAssembler &Asm, MCSection &Sec, setStream(OldStream); SmallVector<char, 128> CompressedContents; - if (Error E = zlib::compress( - StringRef(UncompressedData.data(), UncompressedData.size()), - CompressedContents)) { - consumeError(std::move(E)); + zlib::Status Success = zlib::compress( + StringRef(UncompressedData.data(), UncompressedData.size()), + CompressedContents); + if (Success != zlib::StatusOK) { getStream() << UncompressedData; return; } |
