Skip to content

Commit 3081de8

Browse files
kazutakahiratakazutakahirata
committed
[llvm] Migrate from getNumArgOperands to arg_size (NFC)
Note that getNumArgOperands is considered a legacy name. See llvm/include/llvm/IR/InstrTypes.h for details.
1 parent de5b16d commit 3081de8

File tree

3 files changed

+38
-41
lines changed

3 files changed

+38
-41
lines changed

‎llvm/lib/Bitcode/Writer/BitcodeWriter.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -2917,8 +2917,7 @@ void ModuleBitcodeWriter::writeInstruction(const Instruction &I,
29172917

29182918
// Emit type/value pairs for varargs params.
29192919
if (FTy->isVarArg()) {
2920-
for (unsigned i = FTy->getNumParams(), e = II->getNumArgOperands();
2921-
i != e; ++i)
2920+
for (unsigned i = FTy->getNumParams(), e = II->arg_size(); i != e; ++i)
29222921
pushValueAndType(I.getOperand(i), InstID, Vals); // vararg
29232922
}
29242923
break;
@@ -2999,8 +2998,7 @@ void ModuleBitcodeWriter::writeInstruction(const Instruction &I,
29992998

30002999
// Emit type/value pairs for varargs params.
30013000
if (FTy->isVarArg()) {
3002-
for (unsigned i = FTy->getNumParams(), e = CBI->getNumArgOperands();
3003-
i != e; ++i)
3001+
for (unsigned i = FTy->getNumParams(), e = CBI->arg_size(); i != e; ++i)
30043002
pushValueAndType(I.getOperand(i), InstID, Vals); // vararg
30053003
}
30063004
break;
@@ -3164,8 +3162,7 @@ void ModuleBitcodeWriter::writeInstruction(const Instruction &I,
31643162

31653163
// Emit type/value pairs for varargs params.
31663164
if (FTy->isVarArg()) {
3167-
for (unsigned i = FTy->getNumParams(), e = CI.getNumArgOperands();
3168-
i != e; ++i)
3165+
for (unsigned i = FTy->getNumParams(), e = CI.arg_size(); i != e; ++i)
31693166
pushValueAndType(CI.getArgOperand(i), InstID, Vals); // varargs
31703167
}
31713168
break;

‎llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp

+33-33
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,14 @@ TEST_F(OpenMPIRBuilderTest, CreateBarrier) {
228228

229229
CallInst *GTID = dyn_cast<CallInst>(&BB->front());
230230
EXPECT_NE(GTID, nullptr);
231-
EXPECT_EQ(GTID->getNumArgOperands(), 1U);
231+
EXPECT_EQ(GTID->arg_size(), 1U);
232232
EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
233233
EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
234234
EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
235235

236236
CallInst *Barrier = dyn_cast<CallInst>(GTID->getNextNode());
237237
EXPECT_NE(Barrier, nullptr);
238-
EXPECT_EQ(Barrier->getNumArgOperands(), 2U);
238+
EXPECT_EQ(Barrier->arg_size(), 2U);
239239
EXPECT_EQ(Barrier->getCalledFunction()->getName(), "__kmpc_barrier");
240240
EXPECT_FALSE(Barrier->getCalledFunction()->doesNotAccessMemory());
241241
EXPECT_FALSE(Barrier->getCalledFunction()->doesNotFreeMemory());
@@ -272,14 +272,14 @@ TEST_F(OpenMPIRBuilderTest, CreateCancel) {
272272

273273
CallInst *GTID = dyn_cast<CallInst>(&BB->front());
274274
EXPECT_NE(GTID, nullptr);
275-
EXPECT_EQ(GTID->getNumArgOperands(), 1U);
275+
EXPECT_EQ(GTID->arg_size(), 1U);
276276
EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
277277
EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
278278
EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
279279

280280
CallInst *Cancel = dyn_cast<CallInst>(GTID->getNextNode());
281281
EXPECT_NE(Cancel, nullptr);
282-
EXPECT_EQ(Cancel->getNumArgOperands(), 3U);
282+
EXPECT_EQ(Cancel->arg_size(), 3U);
283283
EXPECT_EQ(Cancel->getCalledFunction()->getName(), "__kmpc_cancel");
284284
EXPECT_FALSE(Cancel->getCalledFunction()->doesNotAccessMemory());
285285
EXPECT_FALSE(Cancel->getCalledFunction()->doesNotFreeMemory());
@@ -290,13 +290,13 @@ TEST_F(OpenMPIRBuilderTest, CreateCancel) {
290290
EXPECT_EQ(CancelBBTI->getSuccessor(1)->size(), 3U);
291291
CallInst *GTID1 = dyn_cast<CallInst>(&CancelBBTI->getSuccessor(1)->front());
292292
EXPECT_NE(GTID1, nullptr);
293-
EXPECT_EQ(GTID1->getNumArgOperands(), 1U);
293+
EXPECT_EQ(GTID1->arg_size(), 1U);
294294
EXPECT_EQ(GTID1->getCalledFunction()->getName(), "__kmpc_global_thread_num");
295295
EXPECT_FALSE(GTID1->getCalledFunction()->doesNotAccessMemory());
296296
EXPECT_FALSE(GTID1->getCalledFunction()->doesNotFreeMemory());
297297
CallInst *Barrier = dyn_cast<CallInst>(GTID1->getNextNode());
298298
EXPECT_NE(Barrier, nullptr);
299-
EXPECT_EQ(Barrier->getNumArgOperands(), 2U);
299+
EXPECT_EQ(Barrier->arg_size(), 2U);
300300
EXPECT_EQ(Barrier->getCalledFunction()->getName(), "__kmpc_cancel_barrier");
301301
EXPECT_FALSE(Barrier->getCalledFunction()->doesNotAccessMemory());
302302
EXPECT_FALSE(Barrier->getCalledFunction()->doesNotFreeMemory());
@@ -345,14 +345,14 @@ TEST_F(OpenMPIRBuilderTest, CreateCancelIfCond) {
345345

346346
CallInst *GTID = dyn_cast<CallInst>(&BB->front());
347347
EXPECT_NE(GTID, nullptr);
348-
EXPECT_EQ(GTID->getNumArgOperands(), 1U);
348+
EXPECT_EQ(GTID->arg_size(), 1U);
349349
EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
350350
EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
351351
EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
352352

353353
CallInst *Cancel = dyn_cast<CallInst>(GTID->getNextNode());
354354
EXPECT_NE(Cancel, nullptr);
355-
EXPECT_EQ(Cancel->getNumArgOperands(), 3U);
355+
EXPECT_EQ(Cancel->arg_size(), 3U);
356356
EXPECT_EQ(Cancel->getCalledFunction()->getName(), "__kmpc_cancel");
357357
EXPECT_FALSE(Cancel->getCalledFunction()->doesNotAccessMemory());
358358
EXPECT_FALSE(Cancel->getCalledFunction()->doesNotFreeMemory());
@@ -364,13 +364,13 @@ TEST_F(OpenMPIRBuilderTest, CreateCancelIfCond) {
364364
EXPECT_EQ(CancelBBTI->getSuccessor(1)->size(), 3U);
365365
CallInst *GTID1 = dyn_cast<CallInst>(&CancelBBTI->getSuccessor(1)->front());
366366
EXPECT_NE(GTID1, nullptr);
367-
EXPECT_EQ(GTID1->getNumArgOperands(), 1U);
367+
EXPECT_EQ(GTID1->arg_size(), 1U);
368368
EXPECT_EQ(GTID1->getCalledFunction()->getName(), "__kmpc_global_thread_num");
369369
EXPECT_FALSE(GTID1->getCalledFunction()->doesNotAccessMemory());
370370
EXPECT_FALSE(GTID1->getCalledFunction()->doesNotFreeMemory());
371371
CallInst *Barrier = dyn_cast<CallInst>(GTID1->getNextNode());
372372
EXPECT_NE(Barrier, nullptr);
373-
EXPECT_EQ(Barrier->getNumArgOperands(), 2U);
373+
EXPECT_EQ(Barrier->arg_size(), 2U);
374374
EXPECT_EQ(Barrier->getCalledFunction()->getName(), "__kmpc_cancel_barrier");
375375
EXPECT_FALSE(Barrier->getCalledFunction()->doesNotAccessMemory());
376376
EXPECT_FALSE(Barrier->getCalledFunction()->doesNotFreeMemory());
@@ -414,14 +414,14 @@ TEST_F(OpenMPIRBuilderTest, CreateCancelBarrier) {
414414

415415
CallInst *GTID = dyn_cast<CallInst>(&BB->front());
416416
EXPECT_NE(GTID, nullptr);
417-
EXPECT_EQ(GTID->getNumArgOperands(), 1U);
417+
EXPECT_EQ(GTID->arg_size(), 1U);
418418
EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
419419
EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
420420
EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
421421

422422
CallInst *Barrier = dyn_cast<CallInst>(GTID->getNextNode());
423423
EXPECT_NE(Barrier, nullptr);
424-
EXPECT_EQ(Barrier->getNumArgOperands(), 2U);
424+
EXPECT_EQ(Barrier->arg_size(), 2U);
425425
EXPECT_EQ(Barrier->getCalledFunction()->getName(), "__kmpc_cancel_barrier");
426426
EXPECT_FALSE(Barrier->getCalledFunction()->doesNotAccessMemory());
427427
EXPECT_FALSE(Barrier->getCalledFunction()->doesNotFreeMemory());
@@ -575,7 +575,7 @@ TEST_F(OpenMPIRBuilderTest, ParallelSimple) {
575575
ASSERT_NE(ForkCI, nullptr);
576576

577577
EXPECT_EQ(ForkCI->getCalledFunction()->getName(), "__kmpc_fork_call");
578-
EXPECT_EQ(ForkCI->getNumArgOperands(), 4U);
578+
EXPECT_EQ(ForkCI->arg_size(), 4U);
579579
EXPECT_TRUE(isa<GlobalVariable>(ForkCI->getArgOperand(0)));
580580
EXPECT_EQ(ForkCI->getArgOperand(1),
581581
ConstantInt::get(Type::getInt32Ty(Ctx), 1U));
@@ -669,7 +669,7 @@ TEST_F(OpenMPIRBuilderTest, ParallelNested) {
669669
ASSERT_NE(ForkCI, nullptr);
670670

671671
EXPECT_EQ(ForkCI->getCalledFunction()->getName(), "__kmpc_fork_call");
672-
EXPECT_EQ(ForkCI->getNumArgOperands(), 3U);
672+
EXPECT_EQ(ForkCI->arg_size(), 3U);
673673
EXPECT_TRUE(isa<GlobalVariable>(ForkCI->getArgOperand(0)));
674674
EXPECT_EQ(ForkCI->getArgOperand(1),
675675
ConstantInt::get(Type::getInt32Ty(Ctx), 0U));
@@ -777,7 +777,7 @@ TEST_F(OpenMPIRBuilderTest, ParallelNested2Inner) {
777777
ASSERT_NE(ForkCI, nullptr);
778778

779779
EXPECT_EQ(ForkCI->getCalledFunction()->getName(), "__kmpc_fork_call");
780-
EXPECT_EQ(ForkCI->getNumArgOperands(), 3U);
780+
EXPECT_EQ(ForkCI->arg_size(), 3U);
781781
EXPECT_TRUE(isa<GlobalVariable>(ForkCI->getArgOperand(0)));
782782
EXPECT_EQ(ForkCI->getArgOperand(1),
783783
ConstantInt::get(Type::getInt32Ty(Ctx), 0U));
@@ -892,15 +892,15 @@ TEST_F(OpenMPIRBuilderTest, ParallelIfCond) {
892892
}
893893

894894
EXPECT_EQ(ForkCI->getCalledFunction()->getName(), "__kmpc_fork_call");
895-
EXPECT_EQ(ForkCI->getNumArgOperands(), 4U);
895+
EXPECT_EQ(ForkCI->arg_size(), 4U);
896896
EXPECT_TRUE(isa<GlobalVariable>(ForkCI->getArgOperand(0)));
897897
EXPECT_EQ(ForkCI->getArgOperand(1),
898898
ConstantInt::get(Type::getInt32Ty(Ctx), 1));
899899
Value *StoredForkArg = findStoredValue<AllocaInst>(ForkCI->getArgOperand(3));
900900
EXPECT_EQ(StoredForkArg, F->arg_begin());
901901

902902
EXPECT_EQ(DirectCI->getCalledFunction(), OutlinedFn);
903-
EXPECT_EQ(DirectCI->getNumArgOperands(), 3U);
903+
EXPECT_EQ(DirectCI->arg_size(), 3U);
904904
EXPECT_TRUE(isa<AllocaInst>(DirectCI->getArgOperand(0)));
905905
EXPECT_TRUE(isa<AllocaInst>(DirectCI->getArgOperand(1)));
906906
Value *StoredDirectArg =
@@ -1922,7 +1922,7 @@ TEST_P(OpenMPIRBuilderTestWithParams, DynamicWorkShareLoop) {
19221922
ASSERT_NE(InitCall, nullptr);
19231923
EXPECT_EQ(InitCall->getCalledFunction()->getName(),
19241924
"__kmpc_dispatch_init_4u");
1925-
EXPECT_EQ(InitCall->getNumArgOperands(), 7U);
1925+
EXPECT_EQ(InitCall->arg_size(), 7U);
19261926
EXPECT_EQ(InitCall->getArgOperand(6), ConstantInt::get(LCTy, ChunkSize));
19271927
ConstantInt *SchedVal = cast<ConstantInt>(InitCall->getArgOperand(2));
19281928
EXPECT_EQ(SchedVal->getValue(), static_cast<uint64_t>(SchedType));
@@ -2035,7 +2035,7 @@ TEST_F(OpenMPIRBuilderTest, MasterDirective) {
20352035
EXPECT_TRUE(isa<CallInst>(CondInst->getOperand(0)));
20362036

20372037
CallInst *MasterEntryCI = cast<CallInst>(CondInst->getOperand(0));
2038-
EXPECT_EQ(MasterEntryCI->getNumArgOperands(), 2U);
2038+
EXPECT_EQ(MasterEntryCI->arg_size(), 2U);
20392039
EXPECT_EQ(MasterEntryCI->getCalledFunction()->getName(), "__kmpc_master");
20402040
EXPECT_TRUE(isa<GlobalVariable>(MasterEntryCI->getArgOperand(0)));
20412041

@@ -2050,7 +2050,7 @@ TEST_F(OpenMPIRBuilderTest, MasterDirective) {
20502050
}
20512051
}
20522052
EXPECT_NE(MasterEndCI, nullptr);
2053-
EXPECT_EQ(MasterEndCI->getNumArgOperands(), 2U);
2053+
EXPECT_EQ(MasterEndCI->arg_size(), 2U);
20542054
EXPECT_TRUE(isa<GlobalVariable>(MasterEndCI->getArgOperand(0)));
20552055
EXPECT_EQ(MasterEndCI->getArgOperand(1), MasterEntryCI->getArgOperand(1));
20562056
}
@@ -2117,7 +2117,7 @@ TEST_F(OpenMPIRBuilderTest, MaskedDirective) {
21172117
EXPECT_TRUE(isa<CallInst>(CondInst->getOperand(0)));
21182118

21192119
CallInst *MaskedEntryCI = cast<CallInst>(CondInst->getOperand(0));
2120-
EXPECT_EQ(MaskedEntryCI->getNumArgOperands(), 3U);
2120+
EXPECT_EQ(MaskedEntryCI->arg_size(), 3U);
21212121
EXPECT_EQ(MaskedEntryCI->getCalledFunction()->getName(), "__kmpc_masked");
21222122
EXPECT_TRUE(isa<GlobalVariable>(MaskedEntryCI->getArgOperand(0)));
21232123

@@ -2132,7 +2132,7 @@ TEST_F(OpenMPIRBuilderTest, MaskedDirective) {
21322132
}
21332133
}
21342134
EXPECT_NE(MaskedEndCI, nullptr);
2135-
EXPECT_EQ(MaskedEndCI->getNumArgOperands(), 2U);
2135+
EXPECT_EQ(MaskedEndCI->arg_size(), 2U);
21362136
EXPECT_TRUE(isa<GlobalVariable>(MaskedEndCI->getArgOperand(0)));
21372137
EXPECT_EQ(MaskedEndCI->getArgOperand(1), MaskedEntryCI->getArgOperand(1));
21382138
}
@@ -2191,7 +2191,7 @@ TEST_F(OpenMPIRBuilderTest, CriticalDirective) {
21912191
}
21922192
}
21932193
EXPECT_NE(CriticalEntryCI, nullptr);
2194-
EXPECT_EQ(CriticalEntryCI->getNumArgOperands(), 3U);
2194+
EXPECT_EQ(CriticalEntryCI->arg_size(), 3U);
21952195
EXPECT_EQ(CriticalEntryCI->getCalledFunction()->getName(), "__kmpc_critical");
21962196
EXPECT_TRUE(isa<GlobalVariable>(CriticalEntryCI->getArgOperand(0)));
21972197

@@ -2207,7 +2207,7 @@ TEST_F(OpenMPIRBuilderTest, CriticalDirective) {
22072207
}
22082208
}
22092209
EXPECT_NE(CriticalEndCI, nullptr);
2210-
EXPECT_EQ(CriticalEndCI->getNumArgOperands(), 3U);
2210+
EXPECT_EQ(CriticalEndCI->arg_size(), 3U);
22112211
EXPECT_TRUE(isa<GlobalVariable>(CriticalEndCI->getArgOperand(0)));
22122212
EXPECT_EQ(CriticalEndCI->getArgOperand(1), CriticalEntryCI->getArgOperand(1));
22132213
PointerType *CriticalNamePtrTy =
@@ -2286,14 +2286,14 @@ TEST_F(OpenMPIRBuilderTest, OrderedDirectiveDependSource) {
22862286

22872287
CallInst *GTID = dyn_cast<CallInst>(DependBaseAddrGEP->getNextNode());
22882288
ASSERT_NE(GTID, nullptr);
2289-
EXPECT_EQ(GTID->getNumArgOperands(), 1U);
2289+
EXPECT_EQ(GTID->arg_size(), 1U);
22902290
EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
22912291
EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
22922292
EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
22932293

22942294
CallInst *Depend = dyn_cast<CallInst>(GTID->getNextNode());
22952295
ASSERT_NE(Depend, nullptr);
2296-
EXPECT_EQ(Depend->getNumArgOperands(), 3U);
2296+
EXPECT_EQ(Depend->arg_size(), 3U);
22972297
EXPECT_EQ(Depend->getCalledFunction()->getName(), "__kmpc_doacross_post");
22982298
EXPECT_TRUE(isa<GlobalVariable>(Depend->getArgOperand(0)));
22992299
EXPECT_EQ(Depend->getArgOperand(1), GTID);
@@ -2370,14 +2370,14 @@ TEST_F(OpenMPIRBuilderTest, OrderedDirectiveDependSink) {
23702370

23712371
CallInst *GTID = dyn_cast<CallInst>(DependBaseAddrGEP->getNextNode());
23722372
ASSERT_NE(GTID, nullptr);
2373-
EXPECT_EQ(GTID->getNumArgOperands(), 1U);
2373+
EXPECT_EQ(GTID->arg_size(), 1U);
23742374
EXPECT_EQ(GTID->getCalledFunction()->getName(), "__kmpc_global_thread_num");
23752375
EXPECT_FALSE(GTID->getCalledFunction()->doesNotAccessMemory());
23762376
EXPECT_FALSE(GTID->getCalledFunction()->doesNotFreeMemory());
23772377

23782378
CallInst *Depend = dyn_cast<CallInst>(GTID->getNextNode());
23792379
ASSERT_NE(Depend, nullptr);
2380-
EXPECT_EQ(Depend->getNumArgOperands(), 3U);
2380+
EXPECT_EQ(Depend->arg_size(), 3U);
23812381
EXPECT_EQ(Depend->getCalledFunction()->getName(), "__kmpc_doacross_wait");
23822382
EXPECT_TRUE(isa<GlobalVariable>(Depend->getArgOperand(0)));
23832383
EXPECT_EQ(Depend->getArgOperand(1), GTID);
@@ -2440,7 +2440,7 @@ TEST_F(OpenMPIRBuilderTest, OrderedDirectiveThreads) {
24402440
}
24412441
}
24422442
EXPECT_NE(OrderedEntryCI, nullptr);
2443-
EXPECT_EQ(OrderedEntryCI->getNumArgOperands(), 2U);
2443+
EXPECT_EQ(OrderedEntryCI->arg_size(), 2U);
24442444
EXPECT_EQ(OrderedEntryCI->getCalledFunction()->getName(), "__kmpc_ordered");
24452445
EXPECT_TRUE(isa<GlobalVariable>(OrderedEntryCI->getArgOperand(0)));
24462446

@@ -2455,7 +2455,7 @@ TEST_F(OpenMPIRBuilderTest, OrderedDirectiveThreads) {
24552455
}
24562456
}
24572457
EXPECT_NE(OrderedEndCI, nullptr);
2458-
EXPECT_EQ(OrderedEndCI->getNumArgOperands(), 2U);
2458+
EXPECT_EQ(OrderedEndCI->arg_size(), 2U);
24592459
EXPECT_TRUE(isa<GlobalVariable>(OrderedEndCI->getArgOperand(0)));
24602460
EXPECT_EQ(OrderedEndCI->getArgOperand(1), OrderedEntryCI->getArgOperand(1));
24612461
}
@@ -2627,7 +2627,7 @@ TEST_F(OpenMPIRBuilderTest, SingleDirective) {
26272627
EXPECT_TRUE(isa<CallInst>(CondInst->getOperand(0)));
26282628

26292629
CallInst *SingleEntryCI = cast<CallInst>(CondInst->getOperand(0));
2630-
EXPECT_EQ(SingleEntryCI->getNumArgOperands(), 2U);
2630+
EXPECT_EQ(SingleEntryCI->arg_size(), 2U);
26312631
EXPECT_EQ(SingleEntryCI->getCalledFunction()->getName(), "__kmpc_single");
26322632
EXPECT_TRUE(isa<GlobalVariable>(SingleEntryCI->getArgOperand(0)));
26332633

@@ -2642,7 +2642,7 @@ TEST_F(OpenMPIRBuilderTest, SingleDirective) {
26422642
}
26432643
}
26442644
EXPECT_NE(SingleEndCI, nullptr);
2645-
EXPECT_EQ(SingleEndCI->getNumArgOperands(), 2U);
2645+
EXPECT_EQ(SingleEndCI->arg_size(), 2U);
26462646
EXPECT_TRUE(isa<GlobalVariable>(SingleEndCI->getArgOperand(0)));
26472647
EXPECT_EQ(SingleEndCI->getArgOperand(1), SingleEntryCI->getArgOperand(1));
26482648
}
@@ -3767,7 +3767,7 @@ TEST_F(OpenMPIRBuilderTest, EmitMapperCall) {
37673767

37683768
CallInst *MapperCall = dyn_cast<CallInst>(&BB->back());
37693769
EXPECT_NE(MapperCall, nullptr);
3770-
EXPECT_EQ(MapperCall->getNumArgOperands(), 9U);
3770+
EXPECT_EQ(MapperCall->arg_size(), 9U);
37713771
EXPECT_EQ(MapperCall->getCalledFunction()->getName(),
37723772
"__tgt_target_data_begin_mapper");
37733773
EXPECT_EQ(MapperCall->getOperand(0), SrcLocInfo);

‎llvm/unittests/IR/InstructionsTest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ TEST(InstructionsTest, AlterCallBundles) {
638638

639639
OperandBundleDef NewBundle("after", ConstantInt::get(Int32Ty, 7));
640640
std::unique_ptr<CallInst> Clone(CallInst::Create(Call.get(), NewBundle));
641-
EXPECT_EQ(Call->getNumArgOperands(), Clone->getNumArgOperands());
641+
EXPECT_EQ(Call->arg_size(), Clone->arg_size());
642642
EXPECT_EQ(Call->getArgOperand(0), Clone->getArgOperand(0));
643643
EXPECT_EQ(Call->getCallingConv(), Clone->getCallingConv());
644644
EXPECT_EQ(Call->getTailCallKind(), Clone->getTailCallKind());
@@ -671,7 +671,7 @@ TEST(InstructionsTest, AlterInvokeBundles) {
671671
InvokeInst::Create(Invoke.get(), NewBundle));
672672
EXPECT_EQ(Invoke->getNormalDest(), Clone->getNormalDest());
673673
EXPECT_EQ(Invoke->getUnwindDest(), Clone->getUnwindDest());
674-
EXPECT_EQ(Invoke->getNumArgOperands(), Clone->getNumArgOperands());
674+
EXPECT_EQ(Invoke->arg_size(), Clone->arg_size());
675675
EXPECT_EQ(Invoke->getArgOperand(0), Clone->getArgOperand(0));
676676
EXPECT_EQ(Invoke->getCallingConv(), Clone->getCallingConv());
677677
EXPECT_TRUE(Clone->hasFnAttr(Attribute::AttrKind::Cold));

0 commit comments

Comments
 (0)