[lld] r291834 - Improve an error message and remove fatal(Error &, const Twine &)

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Thu Jan 12 15:43:58 2017
New Revision: 291834

URL: http://llvm.org/viewvc/llvm-project?rev=291834&view=rev
Log:
Improve an error message and remove fatal(Error &, const Twine &)

Modified:
    lld/trunk/ELF/Error.cpp
    lld/trunk/ELF/Error.h
    lld/trunk/ELF/InputSection.cpp

Modified: lld/trunk/ELF/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Error.cpp?rev=291834&r1=291833&r2=291834&view=diff
==============================================================================
--- lld/trunk/ELF/Error.cpp (original)
+++ lld/trunk/ELF/Error.cpp Thu Jan 12 15:43:58 2017
@@ -103,8 +103,4 @@ void elf::fatal(std::error_code EC, cons
   fatal(Prefix + ": " + EC.message());
 }
 
-void elf::fatal(Error &E, const Twine &Prefix) {
-  fatal(Prefix + ": " + llvm::toString(std::move(E)));
-}
-
 } // namespace lld

Modified: lld/trunk/ELF/Error.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Error.h?rev=291834&r1=291833&r2=291834&view=diff
==============================================================================
--- lld/trunk/ELF/Error.h (original)
+++ lld/trunk/ELF/Error.h Thu Jan 12 15:43:58 2017
@@ -44,7 +44,6 @@ void error(std::error_code EC, const Twi
 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.

Modified: lld/trunk/ELF/InputSection.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.cpp?rev=291834&r1=291833&r2=291834&view=diff
==============================================================================
--- lld/trunk/ELF/InputSection.cpp (original)
+++ lld/trunk/ELF/InputSection.cpp Thu Jan 12 15:43:58 2017
@@ -143,7 +143,8 @@ template <class ELFT> void InputSectionB
   }
 
   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);
 }