From: Peter Collingbourne <peter@pcc.me.uk>
Date: Sun, 1 May 2016 05:39:02 +0000 (+0000)
Subject: Further MSVC appeasement.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f643fc10d1915dd687d9f1add0b2f74a03ccd628;p=platform%2Fupstream%2Fllvm.git

Further MSVC appeasement.

llvm-svn: 268185
---

diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h
index 880699a..313689c 100644
--- a/lld/ELF/Symbols.h
+++ b/lld/ELF/Symbols.h
@@ -435,8 +435,8 @@ void replaceBody(Symbol *S, ArgT &&... Arg) {
   static_assert(llvm::AlignOf<T>::Alignment <=
                     llvm::AlignOf<decltype(S->Body)>::Alignment,
                 "Body not aligned enough");
-  static_assert(static_cast<SymbolBody *>(static_cast<T *>(nullptr)) == nullptr,
-                "Not a SymbolBody");
+  assert(static_cast<SymbolBody *>(static_cast<T *>(nullptr)) == nullptr &&
+         "Not a SymbolBody");
   new (S->Body.buffer) T(std::forward<ArgT>(Arg)...);
 }
 
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 8fc2595..d62cb02 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -1487,11 +1487,11 @@ template <class ELFT> void Writer<ELFT>::addStartEndSymbols() {
   auto Define = [&](StringRef Start, StringRef End,
                     OutputSectionBase<ELFT> *OS) {
     if (OS) {
-      Symtab.addSynthetic(Start, *OS, 0);
-      Symtab.addSynthetic(End, *OS, DefinedSynthetic<ELFT>::SectionEnd);
+      this->Symtab.addSynthetic(Start, *OS, 0);
+      this->Symtab.addSynthetic(End, *OS, DefinedSynthetic<ELFT>::SectionEnd);
     } else {
-      Symtab.addIgnored(Start);
-      Symtab.addIgnored(End);
+      this->Symtab.addIgnored(Start);
+      this->Symtab.addIgnored(End);
     }
   };