diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2016-05-01 05:39:02 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2016-05-01 05:39:02 +0000 |
| commit | f643fc10d1915dd687d9f1add0b2f74a03ccd628 (patch) | |
| tree | f480115186767ee9f4532d5b055d44a6e21139b5 | |
| parent | f77ca947ce616d6daa1e68961bf765751446badc (diff) | |
| download | bcm5719-llvm-f643fc10d1915dd687d9f1add0b2f74a03ccd628.tar.gz bcm5719-llvm-f643fc10d1915dd687d9f1add0b2f74a03ccd628.zip | |
Further MSVC appeasement.
llvm-svn: 268185
| -rw-r--r-- | lld/ELF/Symbols.h | 4 | ||||
| -rw-r--r-- | lld/ELF/Writer.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h index 880699aa6f5..313689cab4c 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 8fc2595b229..d62cb02fcfb 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); } }; |
