diff options
| -rw-r--r-- | llvm/include/llvm/CodeGen/AccelTable.h | 24 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp | 20 |
2 files changed, 0 insertions, 44 deletions
diff --git a/llvm/include/llvm/CodeGen/AccelTable.h b/llvm/include/llvm/CodeGen/AccelTable.h index 9731abd1980..734531a65d5 100644 --- a/llvm/include/llvm/CodeGen/AccelTable.h +++ b/llvm/include/llvm/CodeGen/AccelTable.h @@ -326,14 +326,8 @@ public: void emit(AsmPrinter *Asm) const override; -#ifndef _MSC_VER - // The line below is rejected by older versions (TBD) of MSVC. static constexpr Atom Atoms[] = { Atom(dwarf::DW_ATOM_die_offset, dwarf::DW_FORM_data4)}; -#else - // FIXME: Erase this path once the minimum MSCV version has been bumped. - static const SmallVector<Atom, 4> Atoms; -#endif #ifndef NDEBUG void print(raw_ostream &OS) const override; @@ -351,16 +345,10 @@ public: void emit(AsmPrinter *Asm) const override; -#ifndef _MSC_VER - // The line below is rejected by older versions (TBD) of MSVC. static constexpr Atom 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)}; -#else - // FIXME: Erase this path once the minimum MSCV version has been bumped. - static const SmallVector<Atom, 4> Atoms; -#endif #ifndef NDEBUG void print(raw_ostream &OS) const override; @@ -375,14 +363,8 @@ public: void emit(AsmPrinter *Asm) const override; -#ifndef _MSC_VER - // The line below is rejected by older versions (TBD) of MSVC. static constexpr Atom Atoms[] = { Atom(dwarf::DW_ATOM_die_offset, dwarf::DW_FORM_data4)}; -#else - // FIXME: Erase this path once the minimum MSCV version has been bumped. - static const SmallVector<Atom, 4> Atoms; -#endif #ifndef NDEBUG void print(raw_ostream &OS) const override; @@ -406,16 +388,10 @@ public: void emit(AsmPrinter *Asm) const override; -#ifndef _MSC_VER - // The line below is rejected by older versions (TBD) of MSVC. static constexpr Atom 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)}; -#else - // FIXME: Erase this path once the minimum MSCV version has been bumped. - static const SmallVector<Atom, 4> Atoms; -#endif #ifndef NDEBUG void print(raw_ostream &OS) const override; 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 { |
