diff options
| author | Heejin Ahn <aheejin@gmail.com> | 2018-08-22 18:53:48 +0000 | 
|---|---|---|
| committer | Heejin Ahn <aheejin@gmail.com> | 2018-08-22 18:53:48 +0000 | 
| commit | bc6d8970bb6ec44e1a0c8015a803fa382953dfa4 (patch) | |
| tree | 834bab4054620e1abeea0c7223dfb703815105d9 /llvm/lib/Target | |
| parent | a2133f1a681dbcfce14d705252c75eb741c0d7ec (diff) | |
| download | bcm5719-llvm-bc6d8970bb6ec44e1a0c8015a803fa382953dfa4.tar.gz bcm5719-llvm-bc6d8970bb6ec44e1a0c8015a803fa382953dfa4.zip | |
[WebAssembly] Remove MachineFrameInfo arg from checking functions (NFC)
Summary:
There are several functions in the form of `has***` or `needs***` in
`WebAssemblyFrameLowering` and its `MachineFrameInfo` argument can be
obtained from `MachineFunction` so it is not necessarily has to be
passed from a caller. Also, it is more in line with other overriden
fuctions like `hasBP` or `hasReservedCallFrame`, which also take only
`MachineFunction` argument.
Reviewers: dschuff
Subscribers: sbc100, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D51116
llvm-svn: 340438
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp | 20 | ||||
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.h | 5 | 
2 files changed, 12 insertions, 13 deletions
| diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp index 8b156ecc4c6..129c6b5db8b 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp @@ -92,8 +92,8 @@ bool WebAssemblyFrameLowering::needsPrologForEH(  /// Returns true if this function needs a local user-space stack pointer.  /// Unlike a machine stack pointer, the wasm user stack pointer is a global  /// variable, so it is loaded into a register in the prolog. -bool WebAssemblyFrameLowering::needsSP(const MachineFunction &MF, -                                       const MachineFrameInfo &MFI) const { +bool WebAssemblyFrameLowering::needsSP(const MachineFunction &MF) const { +  auto &MFI = MF.getFrameInfo();    return MFI.getStackSize() || MFI.adjustsStack() || hasFP(MF) ||           needsPrologForEH(MF);  } @@ -103,8 +103,9 @@ bool WebAssemblyFrameLowering::needsSP(const MachineFunction &MF,  /// needsSP is false). If false, the stack red zone can be used and only a local  /// SP is needed.  bool WebAssemblyFrameLowering::needsSPWriteback( -    const MachineFunction &MF, const MachineFrameInfo &MFI) const { -  assert(needsSP(MF, MFI)); +    const MachineFunction &MF) const { +  auto &MFI = MF.getFrameInfo(); +  assert(needsSP(MF));    return MFI.getStackSize() > RedZoneSize || MFI.hasCalls() ||           MF.getFunction().hasFnAttribute(Attribute::NoRedZone);  } @@ -129,7 +130,7 @@ WebAssemblyFrameLowering::eliminateCallFramePseudoInstr(           "Call frame pseudos should only be used for dynamic stack adjustment");    const auto *TII = MF.getSubtarget<WebAssemblySubtarget>().getInstrInfo();    if (I->getOpcode() == TII->getCallFrameDestroyOpcode() && -      needsSPWriteback(MF, MF.getFrameInfo())) { +      needsSPWriteback(MF)) {      DebugLoc DL = I->getDebugLoc();      writeSPToGlobal(WebAssembly::SP32, MF, MBB, I, DL);    } @@ -143,7 +144,7 @@ void WebAssemblyFrameLowering::emitPrologue(MachineFunction &MF,    assert(MFI.getCalleeSavedInfo().empty() &&           "WebAssembly should not have callee-saved registers"); -  if (!needsSP(MF, MFI)) return; +  if (!needsSP(MF)) return;    uint64_t StackSize = MFI.getStackSize();    const auto *TII = MF.getSubtarget<WebAssemblySubtarget>().getInstrInfo(); @@ -203,16 +204,15 @@ void WebAssemblyFrameLowering::emitPrologue(MachineFunction &MF,              WebAssembly::FP32)          .addReg(WebAssembly::SP32);    } -  if (StackSize && needsSPWriteback(MF, MFI)) { +  if (StackSize && needsSPWriteback(MF)) {      writeSPToGlobal(WebAssembly::SP32, MF, MBB, InsertPt, DL);    }  }  void WebAssemblyFrameLowering::emitEpilogue(MachineFunction &MF,                                              MachineBasicBlock &MBB) const { -  auto &MFI = MF.getFrameInfo(); -  uint64_t StackSize = MFI.getStackSize(); -  if (!needsSP(MF, MFI) || !needsSPWriteback(MF, MFI)) return; +  uint64_t StackSize = MF.getFrameInfo().getStackSize(); +  if (!needsSP(MF) || !needsSPWriteback(MF)) return;    const auto *TII = MF.getSubtarget<WebAssemblySubtarget>().getInstrInfo();    auto &MRI = MF.getRegInfo();    auto InsertPt = MBB.getFirstTerminator(); diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.h b/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.h index 5e744ad498b..ac25b7b37fd 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.h +++ b/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.h @@ -56,9 +56,8 @@ class WebAssemblyFrameLowering final : public TargetFrameLowering {  private:    bool hasBP(const MachineFunction &MF) const; -  bool needsSP(const MachineFunction &MF, const MachineFrameInfo &MFI) const; -  bool needsSPWriteback(const MachineFunction &MF, -                        const MachineFrameInfo &MFI) const; +  bool needsSP(const MachineFunction &MF) const; +  bool needsSPWriteback(const MachineFunction &MF) const;  };  }  // end namespace llvm | 

