[lld] r325183 - Revert r325158: Convert an assert to a static_assert. NFC.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Wed Feb 14 14:43:43 2018
New Revision: 325183

URL: http://llvm.org/viewvc/llvm-project?rev=325183&view=rev
Log:
Revert r325158: Convert an assert to a static_assert. NFC.

This reverts commit r325158 because it broke GCC builds.

Modified:
    lld/trunk/COFF/Symbols.h
    lld/trunk/ELF/Symbols.h
    lld/trunk/wasm/Symbols.h

Modified: lld/trunk/COFF/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Symbols.h?rev=325183&r1=325182&r2=325183&view=diff
==============================================================================
--- lld/trunk/COFF/Symbols.h (original)
+++ lld/trunk/COFF/Symbols.h Wed Feb 14 14:43:43 2018
@@ -421,8 +421,8 @@ void replaceSymbol(Symbol *S, ArgT &&...
   static_assert(sizeof(T) <= sizeof(SymbolUnion), "Symbol too small");
   static_assert(alignof(T) <= alignof(SymbolUnion),
                 "SymbolUnion not aligned enough");
-  static_assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr,
-                "Not a Symbol");
+  assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr &&
+         "Not a Symbol");
   new (S) T(std::forward<ArgT>(Arg)...);
 }
 } // namespace coff

Modified: lld/trunk/ELF/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=325183&r1=325182&r2=325183&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.h (original)
+++ lld/trunk/ELF/Symbols.h Wed Feb 14 14:43:43 2018
@@ -355,8 +355,8 @@ void replaceSymbol(Symbol *S, ArgT &&...
   static_assert(sizeof(T) <= sizeof(SymbolUnion), "SymbolUnion too small");
   static_assert(alignof(T) <= alignof(SymbolUnion),
                 "SymbolUnion not aligned enough");
-  static_assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr,
-                "Not a Symbol");
+  assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr &&
+         "Not a Symbol");
 
   Symbol Sym = *S;
 

Modified: lld/trunk/wasm/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Symbols.h?rev=325183&r1=325182&r2=325183&view=diff
==============================================================================
--- lld/trunk/wasm/Symbols.h (original)
+++ lld/trunk/wasm/Symbols.h Wed Feb 14 14:43:43 2018
@@ -240,8 +240,8 @@ T *replaceSymbol(Symbol *S, ArgT &&... A
   static_assert(sizeof(T) <= sizeof(SymbolUnion), "Symbol too small");
   static_assert(alignof(T) <= alignof(SymbolUnion),
                 "SymbolUnion not aligned enough");
-  static_assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr,
-                "Not a Symbol");
+  assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr &&
+         "Not a Symbol");
   return new (S) T(std::forward<ArgT>(Arg)...);
 }