Skip to content

Commit 482e9b0

Browse files
lhamesLang Hames
authored andcommitted
[JITLink][i386] Drop EdgeKind_i386 qualification when using enum values.
We don't need to explicitly qualify these values.
1 parent 7245e21 commit 482e9b0

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

llvm/lib/ExecutionEngine/JITLink/ELF_i386.cpp

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -115,27 +115,26 @@ class ELFLinkGraphBuilder_i386 : public ELFLinkGraphBuilder<object::ELF32LE> {
115115
using ELFT = object::ELF32LE;
116116

117117
Expected<i386::EdgeKind_i386> getRelocationKind(const uint32_t Type) {
118-
using namespace i386;
119118
switch (Type) {
120119
case ELF::R_386_32:
121-
return EdgeKind_i386::Pointer32;
120+
return i386::Pointer32;
122121
case ELF::R_386_PC32:
123-
return EdgeKind_i386::PCRel32;
122+
return i386::PCRel32;
124123
case ELF::R_386_16:
125-
return EdgeKind_i386::Pointer16;
124+
return i386::Pointer16;
126125
case ELF::R_386_PC16:
127-
return EdgeKind_i386::PCRel16;
126+
return i386::PCRel16;
128127
case ELF::R_386_GOT32:
129-
return EdgeKind_i386::RequestGOTAndTransformToDelta32FromGOT;
128+
return i386::RequestGOTAndTransformToDelta32FromGOT;
130129
case ELF::R_386_GOT32X:
131130
// TODO: Add a relaxable edge kind and update relaxation optimization.
132-
return EdgeKind_i386::RequestGOTAndTransformToDelta32FromGOT;
131+
return i386::RequestGOTAndTransformToDelta32FromGOT;
133132
case ELF::R_386_GOTPC:
134-
return EdgeKind_i386::Delta32;
133+
return i386::Delta32;
135134
case ELF::R_386_GOTOFF:
136-
return EdgeKind_i386::Delta32FromGOT;
135+
return i386::Delta32FromGOT;
137136
case ELF::R_386_PLT32:
138-
return EdgeKind_i386::BranchPCRel32;
137+
return i386::BranchPCRel32;
139138
}
140139

141140
return make_error<JITLinkError>(
@@ -196,21 +195,21 @@ class ELFLinkGraphBuilder_i386 : public ELFLinkGraphBuilder<object::ELF32LE> {
196195
int64_t Addend = 0;
197196

198197
switch (*Kind) {
199-
case i386::EdgeKind_i386::Pointer32:
200-
case i386::EdgeKind_i386::PCRel32:
201-
case i386::EdgeKind_i386::RequestGOTAndTransformToDelta32FromGOT:
202-
case i386::EdgeKind_i386::Delta32:
203-
case i386::EdgeKind_i386::Delta32FromGOT:
204-
case i386::EdgeKind_i386::BranchPCRel32:
205-
case i386::EdgeKind_i386::BranchPCRel32ToPtrJumpStub:
206-
case i386::EdgeKind_i386::BranchPCRel32ToPtrJumpStubBypassable: {
198+
case i386::Pointer32:
199+
case i386::PCRel32:
200+
case i386::RequestGOTAndTransformToDelta32FromGOT:
201+
case i386::Delta32:
202+
case i386::Delta32FromGOT:
203+
case i386::BranchPCRel32:
204+
case i386::BranchPCRel32ToPtrJumpStub:
205+
case i386::BranchPCRel32ToPtrJumpStubBypassable: {
207206
const char *FixupContent = BlockToFix.getContent().data() +
208207
(FixupAddress - BlockToFix.getAddress());
209208
Addend = *(const support::little32_t *)FixupContent;
210209
break;
211210
}
212-
case i386::EdgeKind_i386::Pointer16:
213-
case i386::EdgeKind_i386::PCRel16: {
211+
case i386::Pointer16:
212+
case i386::PCRel16: {
214213
const char *FixupContent = BlockToFix.getContent().data() +
215214
(FixupAddress - BlockToFix.getAddress());
216215
Addend = *(const support::little16_t *)FixupContent;

0 commit comments

Comments
 (0)