@@ -223,13 +223,11 @@ static unsigned hashCallInst(CallInst *CI) {
223223 // Don't CSE convergent calls in different basic blocks, because they
224224 // implicitly depend on the set of threads that is currently executing.
225225 if (CI->isConvergent ()) {
226- return hash_combine (
227- CI->getOpcode (), CI->getParent (),
228- hash_combine_range (CI->value_op_begin (), CI->value_op_end ()));
226+ return hash_combine (CI->getOpcode (), CI->getParent (),
227+ hash_combine_range (CI->operand_values ()));
229228 }
230- return hash_combine (
231- CI->getOpcode (),
232- hash_combine_range (CI->value_op_begin (), CI->value_op_end ()));
229+ return hash_combine (CI->getOpcode (),
230+ hash_combine_range (CI->operand_values ()));
233231}
234232
235233static unsigned getHashValueImpl (SimpleValue Val) {
@@ -302,12 +300,11 @@ static unsigned getHashValueImpl(SimpleValue Val) {
302300
303301 if (const ExtractValueInst *EVI = dyn_cast<ExtractValueInst>(Inst))
304302 return hash_combine (EVI->getOpcode (), EVI->getOperand (0 ),
305- hash_combine_range (EVI->idx_begin (), EVI-> idx_end ()));
303+ hash_combine_range (EVI->indices ()));
306304
307305 if (const InsertValueInst *IVI = dyn_cast<InsertValueInst>(Inst))
308306 return hash_combine (IVI->getOpcode (), IVI->getOperand (0 ),
309- IVI->getOperand (1 ),
310- hash_combine_range (IVI->idx_begin (), IVI->idx_end ()));
307+ IVI->getOperand (1 ), hash_combine_range (IVI->indices ()));
311308
312309 assert ((isa<CallInst>(Inst) || isa<ExtractElementInst>(Inst) ||
313310 isa<InsertElementInst>(Inst) || isa<ShuffleVectorInst>(Inst) ||
@@ -322,7 +319,7 @@ static unsigned getHashValueImpl(SimpleValue Val) {
322319 std::swap (LHS, RHS);
323320 return hash_combine (
324321 II->getOpcode (), LHS, RHS,
325- hash_combine_range (II->value_op_begin () + 2 , II-> value_op_end ( )));
322+ hash_combine_range (drop_begin ( II->operand_values (), 2 )));
326323 }
327324
328325 // gc.relocate is 'special' call: its second and third operands are
@@ -338,9 +335,8 @@ static unsigned getHashValueImpl(SimpleValue Val) {
338335 return hashCallInst (CI);
339336
340337 // Mix in the opcode.
341- return hash_combine (
342- Inst->getOpcode (),
343- hash_combine_range (Inst->value_op_begin (), Inst->value_op_end ()));
338+ return hash_combine (Inst->getOpcode (),
339+ hash_combine_range (Inst->operand_values ()));
344340}
345341
346342unsigned DenseMapInfo<SimpleValue>::getHashValue(SimpleValue Val) {
@@ -608,9 +604,8 @@ unsigned DenseMapInfo<GEPValue>::getHashValue(const GEPValue &Val) {
608604 if (Val.ConstantOffset .has_value ())
609605 return hash_combine (GEP->getOpcode (), GEP->getPointerOperand (),
610606 Val.ConstantOffset .value ());
611- return hash_combine (
612- GEP->getOpcode (),
613- hash_combine_range (GEP->value_op_begin (), GEP->value_op_end ()));
607+ return hash_combine (GEP->getOpcode (),
608+ hash_combine_range (GEP->operand_values ()));
614609}
615610
616611bool DenseMapInfo<GEPValue>::isEqual(const GEPValue &LHS, const GEPValue &RHS) {
0 commit comments