[llvm] [JITLink][AArch32] Drop target symbol requirement from readAddend() function (PR #72091)
Stefan Gränitz via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 13 00:53:11 PST 2023
https://github.com/weliveindetail created https://github.com/llvm/llvm-project/pull/72091
Reading implicit addend from a relocation site doesn't require a complete `LinkGraph` edge. The operation is independent from `TargetSymbol`, but constructing an `Edge` instance required one. This patch fixes the inconsistency and simplifies some setup code from the error unittests.
>From 8f33d3ae43ebcb3b5857bff0485975af5089ec8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= <stefan.graenitz at gmail.com>
Date: Sun, 12 Nov 2023 21:32:19 +0100
Subject: [PATCH] [JITLink][AArch32] Drop target symbol requirement from
readAddend() functions
Reading implicit addend from a relocation site doesn't require a complete
LinkGraph edge. It's independent from the TargetSymbol, but constructing an
edge instance required one. This patch fixes the inconsistency and simplifies
some setup code from the error unittests.
---
.../llvm/ExecutionEngine/JITLink/aarch32.h | 20 +++++++-------
.../ExecutionEngine/JITLink/ELF_aarch32.cpp | 5 ++--
llvm/lib/ExecutionEngine/JITLink/aarch32.cpp | 26 +++++++++----------
.../JITLink/AArch32ErrorTests.cpp | 21 +++++----------
4 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/aarch32.h b/llvm/include/llvm/ExecutionEngine/JITLink/aarch32.h
index 70a97ff83820cec..94669e0bceb836d 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/aarch32.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/aarch32.h
@@ -226,28 +226,30 @@ struct FixupInfo<Thumb_MovwAbsNC> : public FixupInfo<Thumb_MovtAbs> {
};
/// Helper function to read the initial addend for Data-class relocations.
-Expected<int64_t> readAddendData(LinkGraph &G, Block &B, const Edge &E);
+Expected<int64_t> readAddendData(LinkGraph &G, Block &B, Edge::OffsetT Offset,
+ Edge::Kind Kind);
/// Helper function to read the initial addend for Arm-class relocations.
-Expected<int64_t> readAddendArm(LinkGraph &G, Block &B, const Edge &E);
+Expected<int64_t> readAddendArm(LinkGraph &G, Block &B, Edge::OffsetT Offset,
+ Edge::Kind Kind);
/// Helper function to read the initial addend for Thumb-class relocations.
-Expected<int64_t> readAddendThumb(LinkGraph &G, Block &B, const Edge &E,
- const ArmConfig &ArmCfg);
+Expected<int64_t> readAddendThumb(LinkGraph &G, Block &B, Edge::OffsetT Offset,
+ Edge::Kind Kind, const ArmConfig &ArmCfg);
/// Read the initial addend for a REL-type relocation. It's the value encoded
/// in the immediate field of the fixup location by the compiler.
-inline Expected<int64_t> readAddend(LinkGraph &G, Block &B, const Edge &E,
+inline Expected<int64_t> readAddend(LinkGraph &G, Block &B,
+ Edge::OffsetT Offset, Edge::Kind Kind,
const ArmConfig &ArmCfg) {
- Edge::Kind Kind = E.getKind();
if (Kind <= LastDataRelocation)
- return readAddendData(G, B, E);
+ return readAddendData(G, B, Offset, Kind);
if (Kind <= LastArmRelocation)
- return readAddendArm(G, B, E);
+ return readAddendArm(G, B, Offset, Kind);
if (Kind <= LastThumbRelocation)
- return readAddendThumb(G, B, E, ArmCfg);
+ return readAddendThumb(G, B, Offset, Kind, ArmCfg);
llvm_unreachable("Relocation must be of class Data, Arm or Thumb");
}
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp
index b6b63691d8408ea..132989fcbce0213 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_aarch32.cpp
@@ -173,14 +173,13 @@ class ELFLinkGraphBuilder_aarch32
auto FixupAddress = orc::ExecutorAddr(FixupSect.sh_addr) + Rel.r_offset;
Edge::OffsetT Offset = FixupAddress - BlockToFix.getAddress();
- Edge E(*Kind, Offset, *GraphSymbol, 0);
Expected<int64_t> Addend =
- aarch32::readAddend(*Base::G, BlockToFix, E, ArmCfg);
+ aarch32::readAddend(*Base::G, BlockToFix, Offset, *Kind, ArmCfg);
if (!Addend)
return Addend.takeError();
- E.setAddend(*Addend);
+ Edge E(*Kind, Offset, *GraphSymbol, *Addend);
LLVM_DEBUG({
dbgs() << " ";
printEdge(dbgs(), BlockToFix, E, getELFAArch32EdgeKindName(*Kind));
diff --git a/llvm/lib/ExecutionEngine/JITLink/aarch32.cpp b/llvm/lib/ExecutionEngine/JITLink/aarch32.cpp
index c3823f985ce182d..b80b12ed245192f 100644
--- a/llvm/lib/ExecutionEngine/JITLink/aarch32.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/aarch32.cpp
@@ -304,12 +304,11 @@ void writeImmediate(WritableArmRelocation &R, uint32_t Imm) {
R.Wd = (R.Wd & ~Mask) | Imm;
}
-Expected<int64_t> readAddendData(LinkGraph &G, Block &B, const Edge &E) {
+Expected<int64_t> readAddendData(LinkGraph &G, Block &B, Edge::OffsetT Offset,
+ Edge::Kind Kind) {
llvm::endianness Endian = G.getEndianness();
-
- Edge::Kind Kind = E.getKind();
const char *BlockWorkingMem = B.getContent().data();
- const char *FixupPtr = BlockWorkingMem + E.getOffset();
+ const char *FixupPtr = BlockWorkingMem + Offset;
switch (Kind) {
case Data_Delta32:
@@ -319,13 +318,13 @@ Expected<int64_t> readAddendData(LinkGraph &G, Block &B, const Edge &E) {
return make_error<JITLinkError>(
"In graph " + G.getName() + ", section " + B.getSection().getName() +
" can not read implicit addend for aarch32 edge kind " +
- G.getEdgeKindName(E.getKind()));
+ G.getEdgeKindName(Kind));
}
}
-Expected<int64_t> readAddendArm(LinkGraph &G, Block &B, const Edge &E) {
- ArmRelocation R(B.getContent().data() + E.getOffset());
- Edge::Kind Kind = E.getKind();
+Expected<int64_t> readAddendArm(LinkGraph &G, Block &B, Edge::OffsetT Offset,
+ Edge::Kind Kind) {
+ ArmRelocation R(B.getContent().data() + Offset);
switch (Kind) {
case Arm_Call:
@@ -352,14 +351,13 @@ Expected<int64_t> readAddendArm(LinkGraph &G, Block &B, const Edge &E) {
return make_error<JITLinkError>(
"In graph " + G.getName() + ", section " + B.getSection().getName() +
" can not read implicit addend for aarch32 edge kind " +
- G.getEdgeKindName(E.getKind()));
+ G.getEdgeKindName(Kind));
}
}
-Expected<int64_t> readAddendThumb(LinkGraph &G, Block &B, const Edge &E,
- const ArmConfig &ArmCfg) {
- ThumbRelocation R(B.getContent().data() + E.getOffset());
- Edge::Kind Kind = E.getKind();
+Expected<int64_t> readAddendThumb(LinkGraph &G, Block &B, Edge::OffsetT Offset,
+ Edge::Kind Kind, const ArmConfig &ArmCfg) {
+ ThumbRelocation R(B.getContent().data() + Offset);
switch (Kind) {
case Thumb_Call:
@@ -394,7 +392,7 @@ Expected<int64_t> readAddendThumb(LinkGraph &G, Block &B, const Edge &E,
return make_error<JITLinkError>(
"In graph " + G.getName() + ", section " + B.getSection().getName() +
" can not read implicit addend for aarch32 edge kind " +
- G.getEdgeKindName(E.getKind()));
+ G.getEdgeKindName(Kind));
}
}
diff --git a/llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp b/llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp
index 9a9468b46d5e5cb..d971e32f319834a 100644
--- a/llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp
+++ b/llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp
@@ -44,32 +44,28 @@ TEST(AArch32_ELF, readAddendArmErrors) {
sizeof(ArmWord));
auto &BArm = G->createContentBlock(Sec, ArmContent, B1DummyAddr, ArmAlignment,
AlignmentOffset);
- Symbol &TargetSymbol =
- G->addAnonymousSymbol(BArm, SymbolOffset, SymbolSize, false, false);
- Edge InvalidEdge(Edge::GenericEdgeKind::Invalid, 0 /*Offset*/, TargetSymbol,
- 0 /*Addend*/);
+ Edge::Kind Invalid = Edge::GenericEdgeKind::Invalid;
// Edge kind is tested, block itself is not significant here. So it is tested
// once in Arm
- EXPECT_THAT_EXPECTED(readAddendData(*G, BArm, InvalidEdge),
+ EXPECT_THAT_EXPECTED(readAddendData(*G, BArm, SymbolOffset, Invalid),
FailedWithMessage(testing::HasSubstr(
"can not read implicit addend for aarch32 edge kind "
"INVALID RELOCATION")));
- EXPECT_THAT_EXPECTED(readAddendArm(*G, BArm, InvalidEdge),
+ EXPECT_THAT_EXPECTED(readAddendArm(*G, BArm, SymbolOffset, Invalid),
FailedWithMessage(testing::HasSubstr(
"can not read implicit addend for aarch32 edge kind "
"INVALID RELOCATION")));
- EXPECT_THAT_EXPECTED(readAddendThumb(*G, BArm, InvalidEdge, ArmCfg),
+ EXPECT_THAT_EXPECTED(readAddendThumb(*G, BArm, SymbolOffset, Invalid, ArmCfg),
FailedWithMessage(testing::HasSubstr(
"can not read implicit addend for aarch32 edge kind "
"INVALID RELOCATION")));
for (Edge::Kind K = FirstArmRelocation; K < LastArmRelocation; K += 1) {
- Edge E(K, 0, TargetSymbol, 0);
EXPECT_THAT_EXPECTED(
- readAddendArm(*G, BArm, E),
+ readAddendArm(*G, BArm, SymbolOffset, K),
FailedWithMessage(testing::StartsWith("Invalid opcode")));
}
}
@@ -90,15 +86,10 @@ TEST(AArch32_ELF, readAddendThumbErrors) {
sizeof(ThumbHalfWords));
auto &BThumb = G->createContentBlock(Sec, ThumbContent, B2DummyAddr,
ThumbAlignment, AlignmentOffset);
- Symbol &TargetSymbol =
- G->addAnonymousSymbol(BThumb, SymbolOffset, SymbolSize, false, false);
- Edge InvalidEdge(Edge::GenericEdgeKind::Invalid, 0 /*Offset*/, TargetSymbol,
- 0 /*Addend*/);
for (Edge::Kind K = FirstThumbRelocation; K < LastThumbRelocation; K += 1) {
- Edge E(K, 0, TargetSymbol, 0);
EXPECT_THAT_EXPECTED(
- readAddendThumb(*G, BThumb, E, ArmCfg),
+ readAddendThumb(*G, BThumb, SymbolOffset, K, ArmCfg),
FailedWithMessage(testing::StartsWith("Invalid opcode")));
}
}
More information about the llvm-commits
mailing list