From 52be82590c8951299c401cad87fa515a5795072a Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Thu, 12 Jan 2017 21:43:58 +0000
Subject: [PATCH] Improve an error message and remove fatal(Error &, const
 Twine &)

llvm-svn: 291834
---
 lld/ELF/Error.cpp        | 4 ----
 lld/ELF/Error.h          | 1 -
 lld/ELF/InputSection.cpp | 3 ++-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lld/ELF/Error.cpp b/lld/ELF/Error.cpp
index d9b41f9c599e..6e30f08143ed 100644
--- a/lld/ELF/Error.cpp
+++ b/lld/ELF/Error.cpp
@@ -103,8 +103,4 @@ void elf::fatal(std::error_code EC, const Twine &Prefix) {
   fatal(Prefix + ": " + EC.message());
 }
 
-void elf::fatal(Error &E, const Twine &Prefix) {
-  fatal(Prefix + ": " + llvm::toString(std::move(E)));
-}
-
 } // namespace lld
diff --git a/lld/ELF/Error.h b/lld/ELF/Error.h
index f18cf456da6d..b521fbb9459d 100644
--- a/lld/ELF/Error.h
+++ b/lld/ELF/Error.h
@@ -44,7 +44,6 @@ void error(std::error_code EC, const Twine &Prefix);
 LLVM_ATTRIBUTE_NORETURN void exitLld(int Val);
 LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &Msg);
 LLVM_ATTRIBUTE_NORETURN void fatal(std::error_code EC, const Twine &Prefix);
-LLVM_ATTRIBUTE_NORETURN void fatal(Error &E, const Twine &Prefix);
 
 // check() functions are convenient functions to strip errors
 // from error-or-value objects.
diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 358004248373..dd071f0c583e 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -143,7 +143,8 @@ template <class ELFT> void InputSectionBase<ELFT>::uncompress() {
   }
 
   if (Error E = Decompressor.decompress({OutputBuf, Size}))
-    fatal(E, toString(this));
+    fatal(toString(this) +
+          ": decompress failed: " + llvm::toString(std::move(E)));
   Data = ArrayRef<uint8_t>((uint8_t *)OutputBuf, Size);
 }