From eab8552ac0494ca232fd0ba9747b88f30e9a1e48 Mon Sep 17 00:00:00 2001
From: Vedant Kumar <vsk@apple.com>
Date: Tue, 5 Sep 2017 22:04:00 +0000
Subject: [PATCH] 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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312582 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Object/Decompressor.h               |   8 +-------
 lib/Object/Decompressor.cpp                      |  14 +++-----------
 ...arfdump-decompression-invalid-size.elf-x86-64 | Bin 6853 -> 0 bytes
 .../dwarfdump-decompression-invalid-size.test    |  15 ---------------
 4 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 test/DebugInfo/Inputs/dwarfdump-decompression-invalid-size.elf-x86-64
 delete mode 100644 test/DebugInfo/dwarfdump-decompression-invalid-size.test

diff --git a/include/llvm/Object/Decompressor.h b/include/llvm/Object/Decompressor.h
index 8fc5dc3e9bf..c8e888d285e 100644
--- a/include/llvm/Object/Decompressor.h
+++ b/include/llvm/Object/Decompressor.h
@@ -13,7 +13,6 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/ErrorHandling.h"
 
 namespace llvm {
 namespace object {
@@ -32,9 +31,7 @@ public:
   /// @brief Resize the buffer and uncompress section data into it.
   /// @param Out         Destination buffer.
   template <class T> Error resizeAndDecompress(T &Out) {
-    install_bad_alloc_error_handler(outOfMemoryHandler, this);
     Out.resize(DecompressedSize);
-    remove_bad_alloc_error_handler();
     return decompress({Out.data(), (size_t)DecompressedSize});
   }
 
@@ -55,14 +52,11 @@ public:
   static bool isGnuStyle(StringRef Name);
 
 private:
-  static void outOfMemoryHandler(void *Data, const std::string &Message, bool);
-
-  Decompressor(StringRef Name, StringRef Data);
+  Decompressor(StringRef Data);
 
   Error consumeCompressedGnuHeader();
   Error consumeCompressedZLibHeader(bool Is64Bit, bool IsLittleEndian);
 
-  StringRef SectionName;
   StringRef SectionData;
   uint64_t DecompressedSize;
 };
diff --git a/lib/Object/Decompressor.cpp b/lib/Object/Decompressor.cpp
index 89821822484..53f084d7620 100644
--- a/lib/Object/Decompressor.cpp
+++ b/lib/Object/Decompressor.cpp
@@ -23,7 +23,7 @@ Expected<Decompressor> Decompressor::create(StringRef Name, StringRef Data,
   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 @@ Expected<Decompressor> Decompressor::create(StringRef Name, StringRef Data,
   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 @@ Error Decompressor::decompress(MutableArrayRef<char> Buffer) {
   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.");
-}
diff --git a/test/DebugInfo/Inputs/dwarfdump-decompression-invalid-size.elf-x86-64 b/test/DebugInfo/Inputs/dwarfdump-decompression-invalid-size.elf-x86-64
deleted file mode 100644
index 7e6efcf1f5b0b22b9f0159590e772435d6b387ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6853
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

diff --git a/test/DebugInfo/dwarfdump-decompression-invalid-size.test b/test/DebugInfo/dwarfdump-decompression-invalid-size.test
deleted file mode 100644
index 32e9d2e63b3..00000000000
--- a/test/DebugInfo/dwarfdump-decompression-invalid-size.test
+++ /dev/null
@@ -1,15 +0,0 @@
-REQUIRES: zlib
-
-// dwarfdump-decompression-invalid-size.elf-x86-64 is prepared using following
-// source code and invocation:
-// test.cpp:
-// int main() { return 0; }
-//
-// gcc test.cpp -o out -g -Wl,--compress-debug-sections,zlib
-//
-// After that result object was modified manually. Decompressed size of
-// .debug_frame section was changed to 0xffffffffffffffff in compression
-// header.
-RUN: not llvm-dwarfdump %p/Inputs/dwarfdump-decompression-invalid-size.elf-x86-64 2>&1 | FileCheck %s
-
-CHECK: decompression of '.debug_frame' failed: unable to allocate 18446744073709551615 bytes.