Revert "[Decompression] Fail gracefully when out of memory"
This reverts commit r312526.
Revert "Fix test/DebugInfo/dwarfdump-decompression-invalid-size.test"
This reverts commit r312527.
It causes an ASan failure:
http://lab.llvm.org:8080/green/job/clang-stage2-cmake-RgSan_check/4150
llvm-svn: 312582
diff --git a/llvm/lib/Object/Decompressor.cpp b/llvm/lib/Object/Decompressor.cpp
index 8982182..53f084d 100644
--- a/llvm/lib/Object/Decompressor.cpp
+++ b/llvm/lib/Object/Decompressor.cpp
@@ -23,7 +23,7 @@
if (!zlib::isAvailable())
return createError("zlib is not available");
- Decompressor D(Name, Data);
+ Decompressor D(Data);
Error Err = isGnuStyle(Name) ? D.consumeCompressedGnuHeader()
: D.consumeCompressedZLibHeader(Is64Bit, IsLE);
if (Err)
@@ -31,8 +31,8 @@
return D;
}
-Decompressor::Decompressor(StringRef Name, StringRef Data)
- : SectionName(Name), SectionData(Data), DecompressedSize(0) {}
+Decompressor::Decompressor(StringRef Data)
+ : SectionData(Data), DecompressedSize(0) {}
Error Decompressor::consumeCompressedGnuHeader() {
if (!SectionData.startswith("ZLIB"))
@@ -92,11 +92,3 @@
size_t Size = Buffer.size();
return zlib::uncompress(SectionData, Buffer.data(), Size);
}
-
-void Decompressor::outOfMemoryHandler(void *Data, const std::string &Message,
- bool) {
- const auto *D = static_cast<const Decompressor *>(Data);
- report_fatal_error("decompression of '" + Twine(D->SectionName) +
- "' failed: unable to allocate " +
- Twine(D->DecompressedSize) + " bytes.");
-}