From de5f196530b508df3bc8c035ae1db87b56437d88 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Sat, 7 Apr 2018 05:36:44 +0000 Subject: Revert "ARM: Do not spill CSR to stack on entry to noreturn functions" Breaks ubsan test TestCases/Misc/missing_return.cpp on ARM This reverts commit r329287 llvm-svn: 329486 --- llvm/lib/Target/ARM/ARMFrameLowering.cpp | 11 ----------- llvm/lib/Target/ARM/ARMFrameLowering.h | 2 -- 2 files changed, 13 deletions(-) (limited to 'llvm/lib/Target/ARM') diff --git a/llvm/lib/Target/ARM/ARMFrameLowering.cpp b/llvm/lib/Target/ARM/ARMFrameLowering.cpp index f9d2b606987..5da1e766a9e 100644 --- a/llvm/lib/Target/ARM/ARMFrameLowering.cpp +++ b/llvm/lib/Target/ARM/ARMFrameLowering.cpp @@ -87,17 +87,6 @@ bool ARMFrameLowering::noFramePointerElim(const MachineFunction &MF) const { MF.getSubtarget().useFastISel(); } -/// Returns true if the target can safely skip saving callee-saved registers -/// for noreturn nounwind functions. -bool ARMFrameLowering::enableCalleeSaveSkip(const MachineFunction &MF) const { - assert(MF.getFunction().hasFnAttribute(Attribute::NoReturn) && - MF.getFunction().hasFnAttribute(Attribute::NoUnwind)); - - // Frame pointer and link register are not treated as normal CSR, thus we - // can always skip CSR saves for nonreturning functions. - return true; -} - /// hasFP - Return true if the specified function should have a dedicated frame /// pointer register. This is true if the function has variable sized allocas /// or if frame pointer elimination is disabled. diff --git a/llvm/lib/Target/ARM/ARMFrameLowering.h b/llvm/lib/Target/ARM/ARMFrameLowering.h index e994cab28fe..1f18e2bf80c 100644 --- a/llvm/lib/Target/ARM/ARMFrameLowering.h +++ b/llvm/lib/Target/ARM/ARMFrameLowering.h @@ -44,8 +44,6 @@ public: bool noFramePointerElim(const MachineFunction &MF) const override; - bool enableCalleeSaveSkip(const MachineFunction &MF) const override; - bool hasFP(const MachineFunction &MF) const override; bool hasReservedCallFrame(const MachineFunction &MF) const override; bool canSimplifyCallFramePseudos(const MachineFunction &MF) const override; -- cgit v1.2.3