Skip to content

Commit 9020026

Browse files
[JITLink][AArch32] Fix GetEdgeKindName function in error tests
The `getGenericEdgeKindName()` function returned "<Unrecognized edge kind>" for all our relocations. We must use `aarch32::getEdgeKindName()` instead.
1 parent e970652 commit 9020026

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ using namespace llvm::support::endian;
2020
constexpr unsigned PointerSize = 4;
2121
auto G = std::make_unique<LinkGraph>("foo", Triple("armv7-linux-gnueabi"),
2222
PointerSize, endianness::little,
23-
getGenericEdgeKindName);
23+
aarch32::getEdgeKindName);
2424
auto &Sec =
2525
G->createSection("__data", orc::MemProt::Read | orc::MemProt::Write);
2626

@@ -52,9 +52,10 @@ TEST(AArch32_ELF, readAddendArmErrors) {
5252
"INVALID RELOCATION")));
5353

5454
for (Edge::Kind K = FirstArmRelocation; K < LastArmRelocation; K += 1) {
55-
EXPECT_THAT_EXPECTED(
56-
readAddend(*G, BArm, SymbolOffset, K, ArmCfg),
57-
FailedWithMessage(testing::StartsWith("Invalid opcode")));
55+
EXPECT_THAT_EXPECTED(readAddend(*G, BArm, SymbolOffset, K, ArmCfg),
56+
FailedWithMessage(testing::AllOf(
57+
testing::StartsWith("Invalid opcode"),
58+
testing::EndsWith(aarch32::getEdgeKindName(K)))));
5859
}
5960
}
6061

@@ -76,9 +77,10 @@ TEST(AArch32_ELF, readAddendThumbErrors) {
7677
ThumbAlignment, AlignmentOffset);
7778

7879
for (Edge::Kind K = FirstThumbRelocation; K < LastThumbRelocation; K += 1) {
79-
EXPECT_THAT_EXPECTED(
80-
readAddend(*G, BThumb, SymbolOffset, K, ArmCfg),
81-
FailedWithMessage(testing::StartsWith("Invalid opcode")));
80+
EXPECT_THAT_EXPECTED(readAddend(*G, BThumb, SymbolOffset, K, ArmCfg),
81+
FailedWithMessage(testing::AllOf(
82+
testing::StartsWith("Invalid opcode"),
83+
testing::EndsWith(aarch32::getEdgeKindName(K)))));
8284
}
8385
}
8486

@@ -108,7 +110,7 @@ TEST(AArch32_ELF, applyFixupArmErrors) {
108110
EXPECT_THAT_ERROR(applyFixup(*G, BArm, E, ArmCfg),
109111
FailedWithMessage(testing::AllOf(
110112
testing::StartsWith("Invalid opcode"),
111-
testing::EndsWith(G->getEdgeKindName(K)))));
113+
testing::EndsWith(aarch32::getEdgeKindName(K)))));
112114
}
113115
}
114116

@@ -149,6 +151,6 @@ TEST(AArch32_ELF, applyFixupThumbErrors) {
149151
EXPECT_THAT_ERROR(applyFixup(*G, BThumb, E, ArmCfg),
150152
FailedWithMessage(testing::AllOf(
151153
testing::StartsWith("Invalid opcode"),
152-
testing::EndsWith(G->getEdgeKindName(K)))));
154+
testing::EndsWith(aarch32::getEdgeKindName(K)))));
153155
}
154156
}

0 commit comments

Comments
 (0)