Skip to content

[JITLink][i386] Avoid 'i386' name clashing with built-in macro #137063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+48 −48
Closed

[JITLink][i386] Avoid 'i386' name clashing with built-in macro #137063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions llvm/include/llvm/ExecutionEngine/JITLink/i386.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "llvm/ExecutionEngine/JITLink/JITLink.h"
#include "llvm/ExecutionEngine/JITLink/TableManager.h"

namespace llvm::jitlink::i386 {
namespace llvm::jitlink::i386_ {
/// Represets i386 fixups
enum EdgeKind_i386 : Edge::Kind {

Expand Down Expand Up @@ -184,31 +184,31 @@ const char *getEdgeKindName(Edge::Kind K);
/// Apply fixup expression for edge to block content.
inline Error applyFixup(LinkGraph &G, Block &B, const Edge &E,
const Symbol *GOTSymbol) {
using namespace i386;
using namespace i386_;
using namespace llvm::support;

char *BlockWorkingMem = B.getAlreadyMutableContent().data();
char *FixupPtr = BlockWorkingMem + E.getOffset();
auto FixupAddress = B.getAddress() + E.getOffset();

switch (E.getKind()) {
case i386::None: {
case i386_::None: {
break;
}

case i386::Pointer32: {
case i386_::Pointer32: {
uint32_t Value = E.getTarget().getAddress().getValue() + E.getAddend();
*(ulittle32_t *)FixupPtr = Value;
break;
}

case i386::PCRel32: {
case i386_::PCRel32: {
int32_t Value = E.getTarget().getAddress() - FixupAddress + E.getAddend();
*(little32_t *)FixupPtr = Value;
break;
}

case i386::Pointer16: {
case i386_::Pointer16: {
uint32_t Value = E.getTarget().getAddress().getValue() + E.getAddend();
if (LLVM_LIKELY(isUInt<16>(Value)))
*(ulittle16_t *)FixupPtr = Value;
Expand All @@ -217,7 +217,7 @@ inline Error applyFixup(LinkGraph &G, Block &B, const Edge &E,
break;
}

case i386::PCRel16: {
case i386_::PCRel16: {
int32_t Value = E.getTarget().getAddress() - FixupAddress + E.getAddend();
if (LLVM_LIKELY(isInt<16>(Value)))
*(little16_t *)FixupPtr = Value;
Expand All @@ -226,23 +226,23 @@ inline Error applyFixup(LinkGraph &G, Block &B, const Edge &E,
break;
}

case i386::Delta32: {
case i386_::Delta32: {
int32_t Value = E.getTarget().getAddress() - FixupAddress + E.getAddend();
*(little32_t *)FixupPtr = Value;
break;
}

case i386::Delta32FromGOT: {
case i386_::Delta32FromGOT: {
assert(GOTSymbol && "No GOT section symbol");
int32_t Value =
E.getTarget().getAddress() - GOTSymbol->getAddress() + E.getAddend();
*(little32_t *)FixupPtr = Value;
break;
}

case i386::BranchPCRel32:
case i386::BranchPCRel32ToPtrJumpStub:
case i386::BranchPCRel32ToPtrJumpStubBypassable: {
case i386_::BranchPCRel32:
case i386_::BranchPCRel32ToPtrJumpStub:
case i386_::BranchPCRel32ToPtrJumpStubBypassable: {
int32_t Value = E.getTarget().getAddress() - FixupAddress + E.getAddend();
*(little32_t *)FixupPtr = Value;
break;
Expand Down Expand Up @@ -328,14 +328,14 @@ class GOTTableManager : public TableManager<GOTTableManager> {
bool visitEdge(LinkGraph &G, Block *B, Edge &E) {
Edge::Kind KindToSet = Edge::Invalid;
switch (E.getKind()) {
case i386::Delta32FromGOT: {
case i386_::Delta32FromGOT: {
// we need to make sure that the GOT section exists, but don't otherwise
// need to fix up this edge
getGOTSection(G);
return false;
}
case i386::RequestGOTAndTransformToDelta32FromGOT:
KindToSet = i386::Delta32FromGOT;
case i386_::RequestGOTAndTransformToDelta32FromGOT:
KindToSet = i386_::Delta32FromGOT;
break;
default:
return false;
Expand Down Expand Up @@ -374,15 +374,15 @@ class PLTTableManager : public TableManager<PLTTableManager> {
static StringRef getSectionName() { return "$__STUBS"; }

bool visitEdge(LinkGraph &G, Block *B, Edge &E) {
if (E.getKind() == i386::BranchPCRel32 && !E.getTarget().isDefined()) {
if (E.getKind() == i386_::BranchPCRel32 && !E.getTarget().isDefined()) {
DEBUG_WITH_TYPE("jitlink", {
dbgs() << " Fixing " << G.getEdgeKindName(E.getKind()) << " edge at "
<< B->getFixupAddress(E) << " (" << B->getAddress() << " + "
<< formatv("{0:x}", E.getOffset()) << ")\n";
});
// Set the edge kind to Branch32ToPtrJumpStubBypassable to enable it to
// be optimized when the target is in-range.
E.setKind(i386::BranchPCRel32ToPtrJumpStubBypassable);
E.setKind(i386_::BranchPCRel32ToPtrJumpStubBypassable);
E.setTarget(getEntryForTarget(G, E.getTarget()));
return true;
}
Expand Down Expand Up @@ -414,6 +414,6 @@ class PLTTableManager : public TableManager<PLTTableManager> {
/// target
Error optimizeGOTAndStubAccesses(LinkGraph &G);

} // namespace llvm::jitlink::i386
} // namespace llvm::jitlink::i386_

#endif // LLVM_EXECUTIONENGINE_JITLINK_I386_H
44 changes: 22 additions & 22 deletions llvm/lib/ExecutionEngine/JITLink/ELF_i386.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ constexpr StringRef ELFGOTSymbolName = "_GLOBAL_OFFSET_TABLE_";
Error buildTables_ELF_i386(LinkGraph &G) {
LLVM_DEBUG(dbgs() << "Visiting edges in graph:\n");

i386::GOTTableManager GOT;
i386::PLTTableManager PLT(GOT);
i386_::GOTTableManager GOT;
i386_::PLTTableManager PLT(GOT);
visitExistingEdges(G, GOT, PLT);
return Error::success();
}
Expand Down Expand Up @@ -59,7 +59,7 @@ class ELFJITLinker_i386 : public JITLinker<ELFJITLinker_i386> {
if (Sym.getName() != nullptr &&
*Sym.getName() == ELFGOTSymbolName)
if (auto *GOTSection = G.findSectionByName(
i386::GOTTableManager::getSectionName())) {
i386_::GOTTableManager::getSectionName())) {
GOTSymbol = &Sym;
return {*GOTSection, true};
}
Expand All @@ -79,7 +79,7 @@ class ELFJITLinker_i386 : public JITLinker<ELFJITLinker_i386> {
// record it, otherwise we'll create our own.
// If there's a GOT section but we didn't find an external GOT symbol...
if (auto *GOTSection =
G.findSectionByName(i386::GOTTableManager::getSectionName())) {
G.findSectionByName(i386_::GOTTableManager::getSectionName())) {

// Check for an existing defined symbol.
for (auto *Sym : GOTSection->symbols())
Expand All @@ -106,15 +106,15 @@ class ELFJITLinker_i386 : public JITLinker<ELFJITLinker_i386> {
}

Error applyFixup(LinkGraph &G, Block &B, const Edge &E) const {
return i386::applyFixup(G, B, E, GOTSymbol);
return i386_::applyFixup(G, B, E, GOTSymbol);
}
};

template <typename ELFT>
class ELFLinkGraphBuilder_i386 : public ELFLinkGraphBuilder<ELFT> {
private:
static Expected<i386::EdgeKind_i386> getRelocationKind(const uint32_t Type) {
using namespace i386;
static Expected<i386_::EdgeKind_i386> getRelocationKind(const uint32_t Type) {
using namespace i386_;
switch (Type) {
case ELF::R_386_NONE:
return EdgeKind_i386::None;
Expand Down Expand Up @@ -179,31 +179,31 @@ class ELFLinkGraphBuilder_i386 : public ELFLinkGraphBuilder<ELFT> {
Base::GraphSymbols.size()),
inconvertibleErrorCode());

Expected<i386::EdgeKind_i386> Kind = getRelocationKind(Rel.getType(false));
Expected<i386_::EdgeKind_i386> Kind = getRelocationKind(Rel.getType(false));
if (!Kind)
return Kind.takeError();

auto FixupAddress = orc::ExecutorAddr(FixupSection.sh_addr) + Rel.r_offset;
int64_t Addend = 0;

switch (*Kind) {
case i386::EdgeKind_i386::None:
case i386_::EdgeKind_i386::None:
break;
case i386::EdgeKind_i386::Pointer32:
case i386::EdgeKind_i386::PCRel32:
case i386::EdgeKind_i386::RequestGOTAndTransformToDelta32FromGOT:
case i386::EdgeKind_i386::Delta32:
case i386::EdgeKind_i386::Delta32FromGOT:
case i386::EdgeKind_i386::BranchPCRel32:
case i386::EdgeKind_i386::BranchPCRel32ToPtrJumpStub:
case i386::EdgeKind_i386::BranchPCRel32ToPtrJumpStubBypassable: {
case i386_::EdgeKind_i386::Pointer32:
case i386_::EdgeKind_i386::PCRel32:
case i386_::EdgeKind_i386::RequestGOTAndTransformToDelta32FromGOT:
case i386_::EdgeKind_i386::Delta32:
case i386_::EdgeKind_i386::Delta32FromGOT:
case i386_::EdgeKind_i386::BranchPCRel32:
case i386_::EdgeKind_i386::BranchPCRel32ToPtrJumpStub:
case i386_::EdgeKind_i386::BranchPCRel32ToPtrJumpStubBypassable: {
const char *FixupContent = BlockToFix.getContent().data() +
(FixupAddress - BlockToFix.getAddress());
Addend = *(const support::little32_t *)FixupContent;
break;
}
case i386::EdgeKind_i386::Pointer16:
case i386::EdgeKind_i386::PCRel16: {
case i386_::EdgeKind_i386::Pointer16:
case i386_::EdgeKind_i386::PCRel16: {
const char *FixupContent = BlockToFix.getContent().data() +
(FixupAddress - BlockToFix.getAddress());
Addend = *(const support::little16_t *)FixupContent;
Expand All @@ -215,7 +215,7 @@ class ELFLinkGraphBuilder_i386 : public ELFLinkGraphBuilder<ELFT> {
Edge GE(*Kind, Offset, *GraphSymbol, Addend);
LLVM_DEBUG({
dbgs() << " ";
printEdge(dbgs(), BlockToFix, GE, i386::getEdgeKindName(*Kind));
printEdge(dbgs(), BlockToFix, GE, i386_::getEdgeKindName(*Kind));
dbgs() << "\n";
});

Expand All @@ -229,7 +229,7 @@ class ELFLinkGraphBuilder_i386 : public ELFLinkGraphBuilder<ELFT> {
Triple TT, SubtargetFeatures Features)
: ELFLinkGraphBuilder<ELFT>(Obj, std::move(SSP), std::move(TT),
std::move(Features), FileName,
i386::getEdgeKindName) {}
i386_::getEdgeKindName) {}
};

Expected<std::unique_ptr<LinkGraph>>
Expand Down Expand Up @@ -273,7 +273,7 @@ void link_ELF_i386(std::unique_ptr<LinkGraph> G,
Config.PostPrunePasses.push_back(buildTables_ELF_i386);

// Add GOT/Stubs optimizer pass.
Config.PreFixupPasses.push_back(i386::optimizeGOTAndStubAccesses);
Config.PreFixupPasses.push_back(i386_::optimizeGOTAndStubAccesses);
}
if (auto Err = Ctx->modifyPassConfig(*G, Config))
return Ctx->notifyFailed(std::move(Err));
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/ExecutionEngine/JITLink/JITLink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ AnonymousPointerCreator getAnonymousPointerCreator(const Triple &TT) {
case Triple::x86_64:
return x86_64::createAnonymousPointer;
case Triple::x86:
return i386::createAnonymousPointer;
return i386_::createAnonymousPointer;
case Triple::loongarch32:
case Triple::loongarch64:
return loongarch::createAnonymousPointer;
Expand All @@ -482,7 +482,7 @@ PointerJumpStubCreator getPointerJumpStubCreator(const Triple &TT) {
case Triple::x86_64:
return x86_64::createAnonymousPointerJumpStub;
case Triple::x86:
return i386::createAnonymousPointerJumpStub;
return i386_::createAnonymousPointerJumpStub;
case Triple::loongarch32:
case Triple::loongarch64:
return loongarch::createAnonymousPointerJumpStub;
Expand Down
8 changes: 4 additions & 4 deletions llvm/lib/ExecutionEngine/JITLink/i386.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#define DEBUG_TYPE "jitlink"

namespace llvm::jitlink::i386 {
namespace llvm::jitlink::i386_ {

const char *getEdgeKindName(Edge::Kind K) {
switch (K) {
Expand Down Expand Up @@ -55,7 +55,7 @@ Error optimizeGOTAndStubAccesses(LinkGraph &G) {

for (auto *B : G.blocks())
for (auto &E : B->edges()) {
if (E.getKind() == i386::BranchPCRel32ToPtrJumpStubBypassable) {
if (E.getKind() == i386_::BranchPCRel32ToPtrJumpStubBypassable) {
auto &StubBlock = E.getTarget().getBlock();
assert(StubBlock.getSize() == sizeof(PointerJumpStubContent) &&
"Stub block should be stub sized");
Expand All @@ -74,7 +74,7 @@ Error optimizeGOTAndStubAccesses(LinkGraph &G) {

int64_t Displacement = TargetAddr - EdgeAddr + 4;
if (isInt<32>(Displacement)) {
E.setKind(i386::BranchPCRel32);
E.setKind(i386_::BranchPCRel32);
E.setTarget(GOTTarget);
LLVM_DEBUG({
dbgs() << " Replaced stub branch with direct branch:\n ";
Expand All @@ -88,4 +88,4 @@ Error optimizeGOTAndStubAccesses(LinkGraph &G) {
return Error::success();
}

} // namespace llvm::jitlink::i386
} // namespace llvm::jitlink::i386_
4 changes: 2 additions & 2 deletions llvm/unittests/ExecutionEngine/JITLink/StubsTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ TEST(StubsTest, StubsGeneration_i386) {
LinkGraph G("foo", std::make_shared<orc::SymbolStringPool>(),
Triple("i386-unknown-linux-gnu"), SubtargetFeatures(),
getGenericEdgeKindName);
auto [PointerSym, StubSym] = GenerateStub(G, 4U, i386::Pointer32);
auto [PointerSym, StubSym] = GenerateStub(G, 4U, i386_::Pointer32);

EXPECT_EQ(std::distance(StubSym.getBlock().edges().begin(),
StubSym.getBlock().edges().end()),
1U);
auto &JumpEdge = *StubSym.getBlock().edges().begin();
EXPECT_EQ(JumpEdge.getKind(), i386::Pointer32);
EXPECT_EQ(JumpEdge.getKind(), i386_::Pointer32);
EXPECT_EQ(&JumpEdge.getTarget(), &PointerSym);
EXPECT_EQ(StubSym.getBlock().getContent(),
ArrayRef<char>(PointerJumpStubContent));
Expand Down
Loading