From 2c496bb5309c972d59b11f05aee4782ddc087e71 Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Tue, 29 Oct 2019 11:54:38 +0000 Subject: Revert rG70f5aecedef9a6e347e425eb5b843bf797b95319 - "Reland [AArch64][DebugInfo] Do not recompute CalleeSavedStackSize (Take 2)" This fails on EXPENSIVE_CHECKS builds --- llvm/lib/CodeGen/LiveDebugValues.cpp | 3 ++- llvm/lib/CodeGen/RegUsageInfoCollector.cpp | 4 ++-- llvm/lib/CodeGen/TargetFrameLoweringImpl.cpp | 13 ------------- 3 files changed, 4 insertions(+), 16 deletions(-) (limited to 'llvm/lib/CodeGen') diff --git a/llvm/lib/CodeGen/LiveDebugValues.cpp b/llvm/lib/CodeGen/LiveDebugValues.cpp index b15c594..ea96578 100644 --- a/llvm/lib/CodeGen/LiveDebugValues.cpp +++ b/llvm/lib/CodeGen/LiveDebugValues.cpp @@ -1432,7 +1432,8 @@ bool LiveDebugValues::runOnMachineFunction(MachineFunction &MF) { TRI = MF.getSubtarget().getRegisterInfo(); TII = MF.getSubtarget().getInstrInfo(); TFI = MF.getSubtarget().getFrameLowering(); - TFI->getCalleeSaves(MF, CalleeSavedRegs); + TFI->determineCalleeSaves(MF, CalleeSavedRegs, + std::make_unique().get()); LS.initialize(MF); bool Changed = ExtendRanges(MF); diff --git a/llvm/lib/CodeGen/RegUsageInfoCollector.cpp b/llvm/lib/CodeGen/RegUsageInfoCollector.cpp index 5a79ac4..757ff0e 100644 --- a/llvm/lib/CodeGen/RegUsageInfoCollector.cpp +++ b/llvm/lib/CodeGen/RegUsageInfoCollector.cpp @@ -56,7 +56,7 @@ public: bool runOnMachineFunction(MachineFunction &MF) override; - // Call getCalleeSaves and then also set the bits for subregs and + // Call determineCalleeSaves and then also set the bits for subregs and // fully saved superregs. static void computeCalleeSavedRegs(BitVector &SavedRegs, MachineFunction &MF); @@ -199,7 +199,7 @@ computeCalleeSavedRegs(BitVector &SavedRegs, MachineFunction &MF) { // Target will return the set of registers that it saves/restores as needed. SavedRegs.clear(); - TFI.getCalleeSaves(MF, SavedRegs); + TFI.determineCalleeSaves(MF, SavedRegs); if (SavedRegs.none()) return; diff --git a/llvm/lib/CodeGen/TargetFrameLoweringImpl.cpp b/llvm/lib/CodeGen/TargetFrameLoweringImpl.cpp index bc59be8..9eeacc2 100644 --- a/llvm/lib/CodeGen/TargetFrameLoweringImpl.cpp +++ b/llvm/lib/CodeGen/TargetFrameLoweringImpl.cpp @@ -60,19 +60,6 @@ bool TargetFrameLowering::needsFrameIndexResolution( return MF.getFrameInfo().hasStackObjects(); } -void TargetFrameLowering::getCalleeSaves(const MachineFunction &MF, - BitVector &CalleeSaves) const { - const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo(); - CalleeSaves.resize(TRI.getNumRegs()); - - const MachineFrameInfo &MFI = MF.getFrameInfo(); - if (!MFI.isCalleeSavedInfoValid()) - return; - - for (const CalleeSavedInfo &Info : MFI.getCalleeSavedInfo()) - CalleeSaves.set(Info.getReg()); -} - void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs, RegScavenger *RS) const { -- cgit v1.1