[PATCH] D51116: [WebAssembly] Remove MachineFrameInfo arg from checking functions (NFC)
Heejin Ahn via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 22 11:43:24 PDT 2018
aheejin created this revision.
aheejin added reviewers: dschuff, jgravelle-google.
Herald added subscribers: llvm-commits, sunfish, sbc100.
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 takes only
`MachineFunction` argument.
Repository:
rL LLVM
https://reviews.llvm.org/D51116
Files:
lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp
lib/Target/WebAssembly/WebAssemblyFrameLowering.h
Index: lib/Target/WebAssembly/WebAssemblyFrameLowering.h
===================================================================
--- lib/Target/WebAssembly/WebAssemblyFrameLowering.h
+++ lib/Target/WebAssembly/WebAssemblyFrameLowering.h
@@ -56,9 +56,8 @@
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
Index: lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp
===================================================================
--- lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp
+++ lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp
@@ -92,8 +92,8 @@
/// 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 @@
/// 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 @@
"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 @@
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 @@
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();
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51116.162009.patch
Type: text/x-patch
Size: 3522 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180822/9594fd25/attachment.bin>
More information about the llvm-commits
mailing list