@@ -63,10 +63,10 @@ stable_hash llvm::stableHashValue(const MachineOperand &MO) {
63
63
case MachineOperand::MO_Register:
64
64
if (MO.getReg ().isVirtual ()) {
65
65
const MachineRegisterInfo &MRI = MO.getParent ()->getMF ()->getRegInfo ();
66
- SmallVector<unsigned > DefOpcodes;
66
+ SmallVector<stable_hash > DefOpcodes;
67
67
for (auto &Def : MRI.def_instructions (MO.getReg ()))
68
68
DefOpcodes.push_back (Def.getOpcode ());
69
- return hash_combine_range (DefOpcodes.begin (), DefOpcodes.end ());
69
+ return stable_hash_combine_range (DefOpcodes.begin (), DefOpcodes.end ());
70
70
}
71
71
72
72
// Register operands don't have target flags.
@@ -80,7 +80,7 @@ stable_hash llvm::stableHashValue(const MachineOperand &MO) {
80
80
: MO.getFPImm ()->getValueAPF ().bitcastToAPInt ();
81
81
auto ValHash =
82
82
stable_hash_combine_array (Val.getRawData (), Val.getNumWords ());
83
- return hash_combine (MO.getType (), MO.getTargetFlags (), ValHash);
83
+ return stable_hash_combine (MO.getType (), MO.getTargetFlags (), ValHash);
84
84
}
85
85
86
86
case MachineOperand::MO_MachineBasicBlock:
@@ -112,8 +112,8 @@ stable_hash llvm::stableHashValue(const MachineOperand &MO) {
112
112
MO.getIndex ());
113
113
114
114
case MachineOperand::MO_ExternalSymbol:
115
- return hash_combine (MO.getType (), MO.getTargetFlags (), MO. getOffset (),
116
- xxh3_64bits (MO.getSymbolName ()));
115
+ return stable_hash_combine (MO.getType (), MO.getTargetFlags (),
116
+ MO. getOffset (), xxh3_64bits (MO.getSymbolName ()));
117
117
118
118
case MachineOperand::MO_RegisterMask:
119
119
case MachineOperand::MO_RegisterLiveOut: {
@@ -126,15 +126,16 @@ stable_hash llvm::stableHashValue(const MachineOperand &MO) {
126
126
const uint32_t *RegMask = MO.getRegMask ();
127
127
std::vector<llvm::stable_hash> RegMaskHashes (RegMask,
128
128
RegMask + RegMaskSize);
129
- return hash_combine (MO.getType (), MO.getTargetFlags (),
130
- stable_hash_combine_array (RegMaskHashes.data (),
131
- RegMaskHashes.size ()));
129
+ return stable_hash_combine (
130
+ MO.getType (), MO.getTargetFlags (),
131
+ stable_hash_combine_array (RegMaskHashes.data (),
132
+ RegMaskHashes.size ()));
132
133
}
133
134
}
134
135
}
135
136
136
137
assert (0 && " MachineOperand not associated with any MachineFunction" );
137
- return hash_combine (MO.getType (), MO.getTargetFlags ());
138
+ return stable_hash_combine (MO.getType (), MO.getTargetFlags ());
138
139
}
139
140
140
141
case MachineOperand::MO_ShuffleMask: {
@@ -144,14 +145,15 @@ stable_hash llvm::stableHashValue(const MachineOperand &MO) {
144
145
MO.getShuffleMask (), std::back_inserter (ShuffleMaskHashes),
145
146
[](int S) -> llvm::stable_hash { return llvm::stable_hash (S); });
146
147
147
- return hash_combine (MO.getType (), MO.getTargetFlags (),
148
- stable_hash_combine_array (ShuffleMaskHashes.data (),
149
- ShuffleMaskHashes.size ()));
148
+ return stable_hash_combine (
149
+ MO.getType (), MO.getTargetFlags (),
150
+ stable_hash_combine_array (ShuffleMaskHashes.data (),
151
+ ShuffleMaskHashes.size ()));
150
152
}
151
153
case MachineOperand::MO_MCSymbol: {
152
154
auto SymbolName = MO.getMCSymbol ()->getName ();
153
- return hash_combine (MO.getType (), MO.getTargetFlags (),
154
- xxh3_64bits (SymbolName));
155
+ return stable_hash_combine (MO.getType (), MO.getTargetFlags (),
156
+ xxh3_64bits (SymbolName));
155
157
}
156
158
case MachineOperand::MO_CFIIndex:
157
159
return stable_hash_combine (MO.getType (), MO.getTargetFlags (),
0 commit comments