diff options
author | Simon Pilgrim <llvm-dev@redking.me.uk> | 2019-07-09 13:07:48 +0000 |
---|---|---|
committer | Simon Pilgrim <llvm-dev@redking.me.uk> | 2019-07-09 13:07:48 +0000 |
commit | 480e8ad2173a6c6f3df8af7a48abd492dce1846a (patch) | |
tree | 4781815a285626b9f281b9d038c9ce8a7c094a54 /llvm/lib/CodeGen/AsmPrinter | |
parent | 2fa6b546356394bb60dfc8090d4594c6c4c0cbd8 (diff) | |
download | bcm5719-llvm-480e8ad2173a6c6f3df8af7a48abd492dce1846a.tar.gz bcm5719-llvm-480e8ad2173a6c6f3df8af7a48abd492dce1846a.zip |
[CodeGen] AccelTable - remove non-constexpr (MSVC) Atom defs
Now that we've dropped VS2015 support (D64326) we can enable the constexpr variables on MSVC builds as VS2017+ correctly handles them
llvm-svn: 365477
Diffstat (limited to 'llvm/lib/CodeGen/AsmPrinter')
-rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp b/llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp index b5617f46ddd..b1b7921ea97 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp @@ -614,30 +614,10 @@ void AppleAccelTableStaticTypeData::emit(AsmPrinter *Asm) const { Asm->emitInt32(QualifiedNameHash); } -#ifndef _MSC_VER -// The lines below are rejected by older versions (TBD) of MSVC. constexpr AppleAccelTableData::Atom AppleAccelTableTypeData::Atoms[]; constexpr AppleAccelTableData::Atom AppleAccelTableOffsetData::Atoms[]; constexpr AppleAccelTableData::Atom AppleAccelTableStaticOffsetData::Atoms[]; constexpr AppleAccelTableData::Atom AppleAccelTableStaticTypeData::Atoms[]; -#else -// FIXME: Erase this path once the minimum MSCV version has been bumped. -const SmallVector<AppleAccelTableData::Atom, 4> - AppleAccelTableOffsetData::Atoms = { - Atom(dwarf::DW_ATOM_die_offset, dwarf::DW_FORM_data4)}; -const SmallVector<AppleAccelTableData::Atom, 4> AppleAccelTableTypeData::Atoms = - {Atom(dwarf::DW_ATOM_die_offset, dwarf::DW_FORM_data4), - Atom(dwarf::DW_ATOM_die_tag, dwarf::DW_FORM_data2), - Atom(dwarf::DW_ATOM_type_flags, dwarf::DW_FORM_data1)}; -const SmallVector<AppleAccelTableData::Atom, 4> - AppleAccelTableStaticOffsetData::Atoms = { - Atom(dwarf::DW_ATOM_die_offset, dwarf::DW_FORM_data4)}; -const SmallVector<AppleAccelTableData::Atom, 4> - AppleAccelTableStaticTypeData::Atoms = { - Atom(dwarf::DW_ATOM_die_offset, dwarf::DW_FORM_data4), - Atom(dwarf::DW_ATOM_die_tag, dwarf::DW_FORM_data2), - Atom(5, dwarf::DW_FORM_data1), Atom(6, dwarf::DW_FORM_data4)}; -#endif #ifndef NDEBUG void AppleAccelTableWriter::Header::print(raw_ostream &OS) const { |