Skip to content

Commit 5a286a0

Browse files
rui314rui314
committed
Instead of ELFFile<ELFT>::Type, use ELFT::Type. NFC.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@322346 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent c74d471 commit 5a286a0

File tree

6 files changed

+57
-60
lines changed

6 files changed

+57
-60
lines changed

‎include/llvm/Object/ELFObjectFile.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ template <class ELFT> class ELFObjectFile : public ELFObjectFileBase {
200200
public:
201201
LLVM_ELF_IMPORT_TYPES_ELFT(ELFT)
202202

203-
using uintX_t = typename ELFFile<ELFT>::uintX_t;
204-
205-
using Elf_Sym = typename ELFFile<ELFT>::Elf_Sym;
206-
using Elf_Shdr = typename ELFFile<ELFT>::Elf_Shdr;
207-
using Elf_Ehdr = typename ELFFile<ELFT>::Elf_Ehdr;
208-
using Elf_Rel = typename ELFFile<ELFT>::Elf_Rel;
209-
using Elf_Rela = typename ELFFile<ELFT>::Elf_Rela;
210-
using Elf_Dyn = typename ELFFile<ELFT>::Elf_Dyn;
203+
using uintX_t = typename ELFT::uint;
204+
205+
using Elf_Sym = typename ELFT::Sym;
206+
using Elf_Shdr = typename ELFT::Shdr;
207+
using Elf_Ehdr = typename ELFT::Ehdr;
208+
using Elf_Rel = typename ELFT::Rel;
209+
using Elf_Rela = typename ELFT::Rela;
210+
using Elf_Dyn = typename ELFT::Dyn;
211211

212212
private:
213213
ELFObjectFile(MemoryBufferRef Object, ELFFile<ELFT> EF,

‎lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ template <typename ELFT>
148148
static Expected<std::unique_ptr<DyldELFObject<ELFT>>>
149149
createRTDyldELFObject(MemoryBufferRef Buffer, const ObjectFile &SourceObject,
150150
const LoadedELFObjectInfo &L) {
151-
typedef typename ELFFile<ELFT>::Elf_Shdr Elf_Shdr;
151+
typedef typename ELFT::Shdr Elf_Shdr;
152152
typedef typename ELFDataTypeTypedefHelper<ELFT>::value_type addr_type;
153153

154154
Expected<std::unique_ptr<DyldELFObject<ELFT>>> ObjOrErr =

‎tools/llvm-readobj/ARMEHABIPrinter.h

+6-7
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ inline void OpcodeDecoder::Decode(const uint8_t *Opcodes, off_t Offset,
323323

324324
template <typename ET>
325325
class PrinterContext {
326-
typedef typename object::ELFFile<ET>::Elf_Sym Elf_Sym;
327-
typedef typename object::ELFFile<ET>::Elf_Shdr Elf_Shdr;
328-
typedef typename object::ELFFile<ET>::Elf_Rel Elf_Rel;
329-
typedef typename object::ELFFile<ET>::Elf_Word Elf_Word;
326+
typedef typename ET::Sym Elf_Sym;
327+
typedef typename ET::Shdr Elf_Shdr;
328+
typedef typename ET::Rel Elf_Rel;
329+
typedef typename ET::Word Elf_Word;
330330

331331
ScopedPrinter &SW;
332332
const object::ELFFile<ET> *ELF;
@@ -386,7 +386,7 @@ PrinterContext<ET>::FunctionAtAddress(unsigned Section,
386386
}
387387

388388
template <typename ET>
389-
const typename object::ELFFile<ET>::Elf_Shdr *
389+
const typename ET::Shdr *
390390
PrinterContext<ET>::FindExceptionTable(unsigned IndexSectionIndex,
391391
off_t IndexTableOffset) const {
392392
/// Iterate through the sections, searching for the relocation section
@@ -410,7 +410,7 @@ PrinterContext<ET>::FindExceptionTable(unsigned IndexSectionIndex,
410410
if (R.r_offset != static_cast<unsigned>(IndexTableOffset))
411411
continue;
412412

413-
typename object::ELFFile<ET>::Elf_Rela RelA;
413+
typename ET::Rela RelA;
414414
RelA.r_offset = R.r_offset;
415415
RelA.r_info = R.r_info;
416416
RelA.r_addend = 0;
@@ -586,4 +586,3 @@ void PrinterContext<ET>::PrintUnwindInformation() const {
586586
}
587587

588588
#endif
589-

‎tools/llvm-readobj/ELFDumper.cpp

+31-33
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,28 @@ using namespace ELF;
7777

7878
#define TYPEDEF_ELF_TYPES(ELFT) \
7979
using ELFO = ELFFile<ELFT>; \
80-
using Elf_Addr = typename ELFO::Elf_Addr; \
81-
using Elf_Shdr = typename ELFO::Elf_Shdr; \
82-
using Elf_Sym = typename ELFO::Elf_Sym; \
83-
using Elf_Dyn = typename ELFO::Elf_Dyn; \
84-
using Elf_Dyn_Range = typename ELFO::Elf_Dyn_Range; \
85-
using Elf_Rel = typename ELFO::Elf_Rel; \
86-
using Elf_Rela = typename ELFO::Elf_Rela; \
87-
using Elf_Rel_Range = typename ELFO::Elf_Rel_Range; \
88-
using Elf_Rela_Range = typename ELFO::Elf_Rela_Range; \
89-
using Elf_Phdr = typename ELFO::Elf_Phdr; \
90-
using Elf_Half = typename ELFO::Elf_Half; \
91-
using Elf_Ehdr = typename ELFO::Elf_Ehdr; \
92-
using Elf_Word = typename ELFO::Elf_Word; \
93-
using Elf_Hash = typename ELFO::Elf_Hash; \
94-
using Elf_GnuHash = typename ELFO::Elf_GnuHash; \
95-
using Elf_Sym_Range = typename ELFO::Elf_Sym_Range; \
96-
using Elf_Versym = typename ELFO::Elf_Versym; \
97-
using Elf_Verneed = typename ELFO::Elf_Verneed; \
98-
using Elf_Vernaux = typename ELFO::Elf_Vernaux; \
99-
using Elf_Verdef = typename ELFO::Elf_Verdef; \
100-
using Elf_Verdaux = typename ELFO::Elf_Verdaux; \
101-
using uintX_t = typename ELFO::uintX_t;
80+
using Elf_Addr = typename ELFT::Addr; \
81+
using Elf_Shdr = typename ELFT::Shdr; \
82+
using Elf_Sym = typename ELFT::Sym; \
83+
using Elf_Dyn = typename ELFT::Dyn; \
84+
using Elf_Dyn_Range = typename ELFT::DynRange; \
85+
using Elf_Rel = typename ELFT::Rel; \
86+
using Elf_Rela = typename ELFT::Rela; \
87+
using Elf_Rel_Range = typename ELFT::RelRange; \
88+
using Elf_Rela_Range = typename ELFT::RelaRange; \
89+
using Elf_Phdr = typename ELFT::Phdr; \
90+
using Elf_Half = typename ELFT::Half; \
91+
using Elf_Ehdr = typename ELFT::Ehdr; \
92+
using Elf_Word = typename ELFT::Word; \
93+
using Elf_Hash = typename ELFT::Hash; \
94+
using Elf_GnuHash = typename ELFT::GnuHash; \
95+
using Elf_Sym_Range = typename ELFT::SymRange; \
96+
using Elf_Versym = typename ELFT::Versym; \
97+
using Elf_Verneed = typename ELFT::Verneed; \
98+
using Elf_Vernaux = typename ELFT::Vernaux; \
99+
using Elf_Verdef = typename ELFT::Verdef; \
100+
using Elf_Verdaux = typename ELFT::Verdaux; \
101+
using uintX_t = typename ELFT::uint;
102102

103103
namespace {
104104

@@ -295,8 +295,8 @@ template <class ELFT> class MipsGOTParser;
295295

296296
template <typename ELFT> class DumpStyle {
297297
public:
298-
using Elf_Shdr = typename ELFFile<ELFT>::Elf_Shdr;
299-
using Elf_Sym = typename ELFFile<ELFT>::Elf_Sym;
298+
using Elf_Shdr = typename ELFT::Shdr;
299+
using Elf_Sym = typename ELFT::Sym;
300300

301301
DumpStyle(ELFDumper<ELFT> *Dumper) : Dumper(Dumper) {}
302302
virtual ~DumpStyle() = default;
@@ -2444,9 +2444,9 @@ struct GroupSection {
24442444

24452445
template <class ELFT>
24462446
std::vector<GroupSection> getGroups(const ELFFile<ELFT> *Obj) {
2447-
using Elf_Shdr = typename ELFFile<ELFT>::Elf_Shdr;
2448-
using Elf_Sym = typename ELFFile<ELFT>::Elf_Sym;
2449-
using Elf_Word = typename ELFFile<ELFT>::Elf_Word;
2447+
using Elf_Shdr = typename ELFT::Shdr;
2448+
using Elf_Sym = typename ELFT::Sym;
2449+
using Elf_Word = typename ELFT::Word;
24502450

24512451
std::vector<GroupSection> Ret;
24522452
uint64_t I = 0;
@@ -3421,8 +3421,7 @@ static std::string getAMDGPUNoteTypeName(const uint32_t NT) {
34213421

34223422
template <typename ELFT>
34233423
static void printGNUNote(raw_ostream &OS, uint32_t NoteType,
3424-
ArrayRef<typename ELFFile<ELFT>::Elf_Word> Words,
3425-
size_t Size) {
3424+
ArrayRef<typename ELFT::Word> Words, size_t Size) {
34263425
switch (NoteType) {
34273426
default:
34283427
return;
@@ -3461,8 +3460,7 @@ static void printGNUNote(raw_ostream &OS, uint32_t NoteType,
34613460

34623461
template <typename ELFT>
34633462
static void printAMDGPUNote(raw_ostream &OS, uint32_t NoteType,
3464-
ArrayRef<typename ELFFile<ELFT>::Elf_Word> Words,
3465-
size_t Size) {
3463+
ArrayRef<typename ELFT::Word> Words, size_t Size) {
34663464
switch (NoteType) {
34673465
default:
34683466
return;
@@ -3497,8 +3495,8 @@ void GNUStyle<ELFT>::printNotes(const ELFFile<ELFT> *Obj) {
34973495
const Elf_Ehdr *e = Obj->getHeader();
34983496
bool IsCore = e->e_type == ELF::ET_CORE;
34993497

3500-
auto process = [&](const typename ELFFile<ELFT>::Elf_Off Offset,
3501-
const typename ELFFile<ELFT>::Elf_Addr Size) {
3498+
auto process = [&](const typename ELFT::Off Offset,
3499+
const typename ELFT::Addr Size) {
35023500
if (Size <= 0)
35033501
return;
35043502

‎tools/obj2yaml/elf2yaml.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ namespace {
2222
template <class ELFT>
2323
class ELFDumper {
2424
typedef object::Elf_Sym_Impl<ELFT> Elf_Sym;
25-
typedef typename object::ELFFile<ELFT>::Elf_Shdr Elf_Shdr;
26-
typedef typename object::ELFFile<ELFT>::Elf_Word Elf_Word;
27-
typedef typename object::ELFFile<ELFT>::Elf_Rel Elf_Rel;
28-
typedef typename object::ELFFile<ELFT>::Elf_Rela Elf_Rela;
25+
typedef typename ELFT::Shdr Elf_Shdr;
26+
typedef typename ELFT::Word Elf_Word;
27+
typedef typename ELFT::Rel Elf_Rel;
28+
typedef typename ELFT::Rela Elf_Rela;
2929

3030
ArrayRef<Elf_Shdr> Sections;
3131

‎tools/yaml2obj/yaml2elf.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ namespace {
107107
/// point of truth".
108108
template <class ELFT>
109109
class ELFState {
110-
typedef typename object::ELFFile<ELFT>::Elf_Ehdr Elf_Ehdr;
111-
typedef typename object::ELFFile<ELFT>::Elf_Phdr Elf_Phdr;
112-
typedef typename object::ELFFile<ELFT>::Elf_Shdr Elf_Shdr;
113-
typedef typename object::ELFFile<ELFT>::Elf_Sym Elf_Sym;
114-
typedef typename object::ELFFile<ELFT>::Elf_Rel Elf_Rel;
115-
typedef typename object::ELFFile<ELFT>::Elf_Rela Elf_Rela;
110+
typedef typename ELFT::Ehdr Elf_Ehdr;
111+
typedef typename ELFT::Phdr Elf_Phdr;
112+
typedef typename ELFT::Shdr Elf_Shdr;
113+
typedef typename ELFT::Sym Elf_Sym;
114+
typedef typename ELFT::Rel Elf_Rel;
115+
typedef typename ELFT::Rela Elf_Rela;
116116

117117
enum class SymtabType { Static, Dynamic };
118118

@@ -513,7 +513,7 @@ template <class ELFT>
513513
bool ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
514514
const ELFYAML::Group &Section,
515515
ContiguousBlobAccumulator &CBA) {
516-
typedef typename object::ELFFile<ELFT>::Elf_Word Elf_Word;
516+
typedef typename ELFT::Word Elf_Word;
517517
assert(Section.Type == llvm::ELF::SHT_GROUP &&
518518
"Section type is not SHT_GROUP");
519519

0 commit comments

Comments
 (0)