Skip to content

Commit d84a75a

Browse files
committed
Fix the usage issue of getRegMask.
1 parent a943132 commit d84a75a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

llvm/lib/CodeGen/MachineOperand.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ bool MachineOperand::isIdenticalTo(const MachineOperand &Other) const {
363363
case MachineOperand::MO_RegisterMask:
364364
case MachineOperand::MO_RegisterLiveOut: {
365365
// Shallow compare of the two RegMasks
366-
const uint32_t *RegMask = getRegMask();
367-
const uint32_t *OtherRegMask = Other.getRegMask();
366+
const uint32_t *RegMask = isRegMask() ? getRegMask() : getRegLiveOut();
367+
const uint32_t *OtherRegMask = isRegMask() ? Other.getRegMask() : Other.getRegLiveOut();
368368
if (RegMask == OtherRegMask)
369369
return true;
370370

@@ -434,7 +434,7 @@ hash_code llvm::hash_value(const MachineOperand &MO) {
434434
if (const MachineFunction *MF = getMFIfAvailable(MO)) {
435435
const TargetRegisterInfo *TRI = MF->getSubtarget().getRegisterInfo();
436436
unsigned RegMaskSize = MachineOperand::getRegMaskSize(TRI->getNumRegs());
437-
const uint32_t *RegMask = MO.getRegMask();
437+
const uint32_t *RegMask = MO.isRegMask() ? MO.getRegMask() : MO.getRegLiveOut();
438438
std::vector<stable_hash> RegMaskHashes(RegMask, RegMask + RegMaskSize);
439439
return hash_combine(MO.getType(), MO.getTargetFlags(),
440440
stable_hash_combine(RegMaskHashes));

llvm/lib/CodeGen/MachineStableHash.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ stable_hash llvm::stableHashValue(const MachineOperand &MO) {
136136
const TargetRegisterInfo *TRI = MF->getSubtarget().getRegisterInfo();
137137
unsigned RegMaskSize =
138138
MachineOperand::getRegMaskSize(TRI->getNumRegs());
139-
const uint32_t *RegMask = MO.getRegMask();
139+
const uint32_t *RegMask = MO.isRegMask() ? MO.getRegMask() : MO.getRegLiveOut();
140140
std::vector<llvm::stable_hash> RegMaskHashes(RegMask,
141141
RegMask + RegMaskSize);
142142
return stable_hash_combine(MO.getType(), MO.getTargetFlags(),

0 commit comments

Comments
 (0)