Further MSVC appeasement.

llvm-svn: 268185
This commit is contained in:
Peter Collingbourne 2016-05-01 05:39:02 +00:00
parent f77ca947ce
commit f643fc10d1
2 changed files with 6 additions and 6 deletions

View File

@ -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)...);
}

View File

@ -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);
}
};