From 3a9cbffdcb91ff34c96a4fb55b8e6413138fae30 Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Wed, 27 May 2015 08:44:01 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238302 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCObjectFileInfo.h | 4 ---- lib/MC/MCObjectFileInfo.cpp | 17 +++----------- lib/Target/Mips/MipsTargetObjectFile.cpp | 8 +------ lib/Target/Mips/MipsTargetObjectFile.h | 2 -- test/CodeGen/Mips/ehframe-indirect.ll | 30 ++++++------------------ 5 files changed, 11 insertions(+), 50 deletions(-) diff --git a/include/llvm/MC/MCObjectFileInfo.h b/include/llvm/MC/MCObjectFileInfo.h index 57e0c82dc35..f28b9c668cd 100644 --- a/include/llvm/MC/MCObjectFileInfo.h +++ b/include/llvm/MC/MCObjectFileInfo.h @@ -188,8 +188,6 @@ protected: MCSection *XDataSection; public: - virtual ~MCObjectFileInfo() { }; - void InitMCObjectFileInfo(StringRef TT, Reloc::Model RM, CodeModel::Model CM, MCContext &ctx); @@ -354,8 +352,6 @@ private: /// void InitEHFrameSection(); - virtual unsigned SelectMipsTTypeEncoding() const; - public: const Triple &getTargetTriple() const { return TT; } }; diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp index c189d19c12d..e99f036af16 100644 --- a/lib/MC/MCObjectFileInfo.cpp +++ b/lib/MC/MCObjectFileInfo.cpp @@ -324,13 +324,10 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) { 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 @@ void MCObjectFileInfo::InitEHFrameSection() { 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/lib/Target/Mips/MipsTargetObjectFile.cpp b/lib/Target/Mips/MipsTargetObjectFile.cpp index adbe526376e..0f2db6039b6 100644 --- a/lib/Target/Mips/MipsTargetObjectFile.cpp +++ b/lib/Target/Mips/MipsTargetObjectFile.cpp @@ -37,7 +37,6 @@ ExternSData("mextern-sdata", cl::Hidden, cl::init(true)); void MipsTargetObjectFile::Initialize(MCContext &Ctx, const TargetMachine &TM){ - this->TM = &static_cast(TM); TargetLoweringObjectFileELF::Initialize(Ctx, TM); InitializeELF(TM.Options.UseInitArray); @@ -46,6 +45,7 @@ void MipsTargetObjectFile::Initialize(MCContext &Ctx, const TargetMachine &TM){ SmallBSSSection = getContext().getELFSection(".sbss", ELF::SHT_NOBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC); + this->TM = &static_cast(TM); } // A address must be loaded from a small section if its size is less than the @@ -146,9 +146,3 @@ MipsTargetObjectFile::getSectionForConstant(SectionKind Kind, // 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/lib/Target/Mips/MipsTargetObjectFile.h b/lib/Target/Mips/MipsTargetObjectFile.h index 72338d275f8..725f2ffd93d 100644 --- a/lib/Target/Mips/MipsTargetObjectFile.h +++ b/lib/Target/Mips/MipsTargetObjectFile.h @@ -41,8 +41,6 @@ class MipsTargetMachine; MCSection *getSectionForConstant(SectionKind Kind, const Constant *C) const override; - - unsigned SelectMipsTTypeEncoding() const override; }; } // end namespace llvm diff --git a/test/CodeGen/Mips/ehframe-indirect.ll b/test/CodeGen/Mips/ehframe-indirect.ll index a4a82fc352e..f124881a472 100644 --- a/test/CodeGen/Mips/ehframe-indirect.ll +++ b/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 @@ entry: 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 i32 @__gxx_personality_v0(...) 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 -- 2.34.1