Revert r238190 and r238197: [mips] Make TTypeEncoding indirect to allow .eh_frame to be read-only.
This broke the llvm-mips-linux builder and several of our out-of-tree builders.
Initial investigations show that the commit probably isn't the problem but
reverting anyway while I investigate.
llvm-svn: 238302
diff --git a/llvm/include/llvm/MC/MCObjectFileInfo.h b/llvm/include/llvm/MC/MCObjectFileInfo.h
index 57e0c82..f28b9c6 100644
--- a/llvm/include/llvm/MC/MCObjectFileInfo.h
+++ b/llvm/include/llvm/MC/MCObjectFileInfo.h
@@ -188,8 +188,6 @@
MCSection *XDataSection;
public:
- virtual ~MCObjectFileInfo() { };
-
void InitMCObjectFileInfo(StringRef TT, Reloc::Model RM, CodeModel::Model CM,
MCContext &ctx);
@@ -354,8 +352,6 @@
///
void InitEHFrameSection();
- virtual unsigned SelectMipsTTypeEncoding() const;
-
public:
const Triple &getTargetTriple() const { return TT; }
};
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp
index c189d19..e99f036 100644
--- a/llvm/lib/MC/MCObjectFileInfo.cpp
+++ b/llvm/lib/MC/MCObjectFileInfo.cpp
@@ -324,13 +324,10 @@
case Triple::mipsel:
case Triple::mips64:
case Triple::mips64el:
- // MIPS uses indirect pointer to refer personality functions and types, so
- // that the eh_frame section can be read-only. DW.ref.personality will be
- // generated for relocation.
+ // MIPS uses indirect pointer to refer personality functions, so that the
+ // eh_frame section can be read-only. DW.ref.personality will be generated
+ // for relocation.
PersonalityEncoding = dwarf::DW_EH_PE_indirect;
- TTypeEncoding = SelectMipsTTypeEncoding();
- // We don't support PC-relative LSDA references in GAS so we use the default
- // DW_EH_PE_absptr for those.
break;
case Triple::ppc64:
case Triple::ppc64le:
@@ -796,11 +793,3 @@
COFF::IMAGE_SCN_MEM_WRITE,
SectionKind::getDataRel());
}
-
-unsigned MCObjectFileInfo::SelectMipsTTypeEncoding() const {
- // FIXME: The N64 ABI ought to use DW_EH_PE_sdata8 but we can't
- // identify N64 from just a triple. We currently fix this by
- // overriding this function in MipsTargetObjectFile.
- return dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel |
- dwarf::DW_EH_PE_sdata4;
-}
diff --git a/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp b/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp
index adbe526..0f2db60 100644
--- a/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp
+++ b/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp
@@ -37,7 +37,6 @@
cl::init(true));
void MipsTargetObjectFile::Initialize(MCContext &Ctx, const TargetMachine &TM){
- this->TM = &static_cast<const MipsTargetMachine &>(TM);
TargetLoweringObjectFileELF::Initialize(Ctx, TM);
InitializeELF(TM.Options.UseInitArray);
@@ -46,6 +45,7 @@
SmallBSSSection = getContext().getELFSection(".sbss", ELF::SHT_NOBITS,
ELF::SHF_WRITE | ELF::SHF_ALLOC);
+ this->TM = &static_cast<const MipsTargetMachine &>(TM);
}
// A address must be loaded from a small section if its size is less than the
@@ -146,9 +146,3 @@
// Otherwise, we work the same as ELF.
return TargetLoweringObjectFileELF::getSectionForConstant(Kind, C);
}
-
-unsigned MipsTargetObjectFile::SelectMipsTTypeEncoding() const {
- return dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel |
- (TM->getABI().ArePtrs64bit() ? dwarf::DW_EH_PE_sdata8
- : dwarf::DW_EH_PE_sdata4);
-}
diff --git a/llvm/lib/Target/Mips/MipsTargetObjectFile.h b/llvm/lib/Target/Mips/MipsTargetObjectFile.h
index 72338d2..725f2ff 100644
--- a/llvm/lib/Target/Mips/MipsTargetObjectFile.h
+++ b/llvm/lib/Target/Mips/MipsTargetObjectFile.h
@@ -41,8 +41,6 @@
MCSection *getSectionForConstant(SectionKind Kind,
const Constant *C) const override;
-
- unsigned SelectMipsTTypeEncoding() const override;
};
} // end namespace llvm
diff --git a/llvm/test/CodeGen/Mips/ehframe-indirect.ll b/llvm/test/CodeGen/Mips/ehframe-indirect.ll
index a4a82fc..f124881 100644
--- a/llvm/test/CodeGen/Mips/ehframe-indirect.ll
+++ b/llvm/test/CodeGen/Mips/ehframe-indirect.ll
@@ -1,11 +1,9 @@
-; RUN: llc -mtriple=mipsel-linux-gnu < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=O32 %s
-; RUN: llc -mtriple=mipsel-linux-android < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=O32 %s
-; RUN: llc -mtriple=mips64el-linux-gnu -target-abi=n32 < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=N32 %s
-; RUN: llc -mtriple=mips64el-linux-android -target-abi=n32 < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=N32 %s
-; RUN: llc -mtriple=mips64el-linux-gnu < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=N64 %s
-; RUN: llc -mtriple=mips64el-linux-android < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=N64 %s
-
-@_ZTISt9exception = external constant i8*
+; RUN: llc -mtriple=mipsel-linux-gnu < %s | FileCheck -check-prefix=ALL -check-prefix=O32 %s
+; RUN: llc -mtriple=mipsel-linux-android < %s | FileCheck -check-prefix=ALL -check-prefix=O32 %s
+; RUN: llc -mtriple=mips64el-linux-gnu -target-abi=n32 < %s | FileCheck -check-prefix=ALL -check-prefix=N32 %s
+; RUN: llc -mtriple=mips64el-linux-android -target-abi=n32 < %s | FileCheck -check-prefix=ALL -check-prefix=N32 %s
+; RUN: llc -mtriple=mips64el-linux-gnu < %s | FileCheck -check-prefix=ALL -check-prefix=N64 %s
+; RUN: llc -mtriple=mips64el-linux-android < %s | FileCheck -check-prefix=ALL -check-prefix=N64 %s
define i32 @main() {
; ALL: .cfi_startproc
@@ -18,9 +16,7 @@
lpad:
%0 = landingpad { i8*, i32 } personality i8*
- bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
- catch i8* null
- catch i8* bitcast (i8** @_ZTISt9exception to i8*)
+ bitcast (i32 (...)* @__gxx_personality_v0 to i8*) catch i8* null
ret i32 0
cont:
@@ -32,18 +28,6 @@
declare void @foo()
-; ALL: GCC_except_table{{[0-9]+}}:
-; O32: .byte 155 # @TType Encoding = indirect pcrel sdata4
-; N32: .byte 155 # @TType Encoding = indirect pcrel sdata4
-; N64: .byte 156 # @TType Encoding = indirect pcrel sdata8
-; ALL: $[[PC_LABEL:tmp[0-9]+]]:
-; O32: .4byte ($_ZTISt9exception.DW.stub)-($[[PC_LABEL]])
-; N32: .4byte ($_ZTISt9exception.DW.stub)-($[[PC_LABEL]])
-; N64: .8byte ($_ZTISt9exception.DW.stub)-($[[PC_LABEL]])
-; ALL: $_ZTISt9exception.DW.stub:
-; O32: .4byte _ZTISt9exception
-; N32: .4byte _ZTISt9exception
-; N64: .8byte _ZTISt9exception
; ALL: .hidden DW.ref.__gxx_personality_v0
; ALL: .weak DW.ref.__gxx_personality_v0
; ALL: .section .data.DW.ref.__gxx_personality_v0,"aGw",@progbits,DW.ref.__gxx_personality_v0,comdat