Skip to content

Commit aed217e

Browse files
Update tests to not use Br instruction (#139)
Upstream LLVM split Br into CondBr/UncondBr llvm/llvm-project#184027
1 parent 446a245 commit aed217e

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

test/unit/interface/OpMapTests.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ TEST(OpMapBasicTestsName, CoreOpContainsTests) {
3434
OpMap<StringRef> map;
3535

3636
OpDescription retDesc = OpDescription::fromCoreOp(Instruction::Ret);
37-
OpDescription brDesc = OpDescription::fromCoreOp(Instruction::Br);
37+
OpDescription callBrDesc = OpDescription::fromCoreOp(Instruction::CallBr);
3838
map[retDesc] = "RetInst";
3939

4040
EXPECT_TRUE(map.containsCoreOp(Instruction::Ret));
41-
EXPECT_FALSE(map.containsCoreOp(Instruction::Br));
41+
EXPECT_FALSE(map.containsCoreOp(Instruction::CallBr));
4242
EXPECT_EQ(map[retDesc], "RetInst");
4343

44-
map[brDesc] = "BrInst";
44+
map[callBrDesc] = "CallBrInst";
4545
EXPECT_EQ(map[retDesc], "RetInst");
46-
EXPECT_TRUE(map.containsCoreOp(Instruction::Br));
47-
EXPECT_EQ(map[brDesc], "BrInst");
46+
EXPECT_TRUE(map.containsCoreOp(Instruction::CallBr));
47+
EXPECT_EQ(map[callBrDesc], "CallBrInst");
4848
}
4949

5050
TEST(OpMapBasicTestsName, IntrinsicOpContainsTests) {

test/unit/interface/OpSetTests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ TEST(DialectsOpSetSizeTestsName, NonEmptyOpDescriptionsTemplatizedMakerTest) {
6565
}
6666

6767
TEST(DialectsOpSetContainsTestsName, containsCoreOps) {
68-
const OpSet set = OpSet::fromCoreOpcodes({1, 2}); // Ret, Br
68+
const OpSet set = OpSet::fromCoreOpcodes({Instruction::Ret, Instruction::CallBr});
6969
EXPECT_TRUE(set.containsCoreOp(Instruction::Ret));
70-
EXPECT_TRUE(set.containsCoreOp(Instruction::Br));
70+
EXPECT_TRUE(set.containsCoreOp(Instruction::CallBr));
7171
EXPECT_FALSE(set.containsCoreOp(Instruction::Switch));
7272
}
7373

0 commit comments

Comments
 (0)