Skip to content

Commit 78c6296

Browse files
committed
[WebAssembly] Cleaned up register accessors in WebAssemblyMachineFunctionInfo.h
Tested: llvm-lit -v `find test -name WebAssembly` (This is a commit access "test commit" :) llvm-svn: 334979
1 parent 4621e0b commit 78c6296

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

llvm/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,29 @@ class WebAssemblyFunctionInfo final : public MachineFunctionInfo {
8383

8484
void stackifyVReg(unsigned VReg) {
8585
assert(MF.getRegInfo().getUniqueVRegDef(VReg));
86-
if (TargetRegisterInfo::virtReg2Index(VReg) >= VRegStackified.size())
87-
VRegStackified.resize(TargetRegisterInfo::virtReg2Index(VReg) + 1);
88-
VRegStackified.set(TargetRegisterInfo::virtReg2Index(VReg));
86+
auto I = TargetRegisterInfo::virtReg2Index(VReg);
87+
if (I >= VRegStackified.size())
88+
VRegStackified.resize(I + 1);
89+
VRegStackified.set(I);
8990
}
9091
bool isVRegStackified(unsigned VReg) const {
91-
if (TargetRegisterInfo::virtReg2Index(VReg) >= VRegStackified.size())
92+
auto I = TargetRegisterInfo::virtReg2Index(VReg);
93+
if (I >= VRegStackified.size())
9294
return false;
93-
return VRegStackified.test(TargetRegisterInfo::virtReg2Index(VReg));
95+
return VRegStackified.test(I);
9496
}
9597

9698
void initWARegs();
9799
void setWAReg(unsigned VReg, unsigned WAReg) {
98100
assert(WAReg != UnusedReg);
99-
assert(TargetRegisterInfo::virtReg2Index(VReg) < WARegs.size());
100-
WARegs[TargetRegisterInfo::virtReg2Index(VReg)] = WAReg;
101+
auto I = TargetRegisterInfo::virtReg2Index(VReg);
102+
assert(I < WARegs.size());
103+
WARegs[I] = WAReg;
101104
}
102-
unsigned getWAReg(unsigned Reg) const {
103-
assert(TargetRegisterInfo::virtReg2Index(Reg) < WARegs.size());
104-
return WARegs[TargetRegisterInfo::virtReg2Index(Reg)];
105+
unsigned getWAReg(unsigned VReg) const {
106+
auto I = TargetRegisterInfo::virtReg2Index(VReg);
107+
assert(I < WARegs.size());
108+
return WARegs[I];
105109
}
106110

107111
// For a given stackified WAReg, return the id number to print with push/pop.

0 commit comments

Comments
 (0)