diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-04-17 06:17:20 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-04-17 06:17:20 +0000 |
| commit | 1614b2688632a0c0b2fe8bafc5590c11f68c5787 (patch) | |
| tree | 1f1afb2b083d99e41215c3af37757150b3c17865 /llvm/lib/MC | |
| parent | 11a80dcb422ab40e8854a8de0715dce374c107e6 (diff) | |
| download | bcm5719-llvm-1614b2688632a0c0b2fe8bafc5590c11f68c5787.tar.gz bcm5719-llvm-1614b2688632a0c0b2fe8bafc5590c11f68c5787.zip | |
MC: rework static_assert to be MSVC compatible
Visual Studio does not permit referencing a structure member as a static field
for sizeof calculations. Resort to a pointer cast which is compatible across
Visual Studio and other compilers.
llvm-svn: 206445
Diffstat (limited to 'llvm/lib/MC')
| -rw-r--r-- | llvm/lib/MC/WinCOFFObjectWriter.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/lib/MC/WinCOFFObjectWriter.cpp b/llvm/lib/MC/WinCOFFObjectWriter.cpp index 8e5377980d7..cb02fdedec3 100644 --- a/llvm/lib/MC/WinCOFFObjectWriter.cpp +++ b/llvm/lib/MC/WinCOFFObjectWriter.cpp @@ -632,10 +632,8 @@ void WinCOFFObjectWriter::ExecutePostLayoutBinding(MCAssembler &Asm, const MCAsmLayout &Layout) { // "Define" each section & symbol. This creates section & symbol // entries in the staging area. - // FIXME: this used to be - // sizeof(COFF::AuxiliaryFile::FileName) == COFF::SymbolSize - // but VS2013 can't compile that. - static_assert(sizeof(COFF::AuxiliaryFile) == COFF::SymbolSize, + + static_assert(sizeof(((COFF::AuxiliaryFile *)0)->FileName) == COFF::SymbolSize, "size mismatch for COFF::AuxiliaryFile::FileName"); for (auto FI = Asm.file_names_begin(), FE = Asm.file_names_end(); FI != FE; ++FI) { |
