Index: tools/llvm-objcopy/ELF/Object.h =================================================================== --- tools/llvm-objcopy/ELF/Object.h +++ tools/llvm-objcopy/ELF/Object.h @@ -59,6 +59,7 @@ iterator begin() { return iterator(Sections.data()); } iterator end() { return iterator(Sections.data() + Sections.size()); } + size_t size() { return Sections.size(); } SectionBase *getSection(uint32_t Index, Twine ErrMsg); Index: tools/llvm-objcopy/ELF/Object.cpp =================================================================== --- tools/llvm-objcopy/ELF/Object.cpp +++ tools/llvm-objcopy/ELF/Object.cpp @@ -1221,11 +1221,6 @@ " in elf header " + " is not a string table"); } -// A generic size function which computes sizes of any random access range. -template size_t size(R &&Range) { - return static_cast(std::end(Range) - std::begin(Range)); -} - Writer::~Writer() {} Reader::~Reader() {} @@ -1282,7 +1277,7 @@ Ehdr.e_phentsize = (Ehdr.e_phnum != 0) ? sizeof(Elf_Phdr) : 0; Ehdr.e_flags = Obj.Flags; Ehdr.e_ehsize = sizeof(Elf_Ehdr); - if (WriteSectionHeaders && size(Obj.sections()) != 0) { + if (WriteSectionHeaders && Obj.sections().size() != 0) { Ehdr.e_shentsize = sizeof(Elf_Shdr); Ehdr.e_shoff = Obj.SHOffset; // """ @@ -1291,7 +1286,7 @@ // number of section header table entries is contained in the sh_size field // of the section header at index 0. // """ - auto Shnum = size(Obj.sections()) + 1; + auto Shnum = Obj.sections().size() + 1; if (Shnum >= SHN_LORESERVE) Ehdr.e_shnum = 0; else @@ -1330,7 +1325,7 @@ Shdr.sh_addr = 0; Shdr.sh_offset = 0; // See writeEhdr for why we do this. - uint64_t Shnum = size(Obj.sections()) + 1; + uint64_t Shnum = Obj.sections().size() + 1; if (Shnum >= SHN_LORESERVE) Shdr.sh_size = Shnum; else @@ -1564,7 +1559,7 @@ // We already have the section header offset so we can calculate the total // size by just adding up the size of each section header. auto NullSectionSize = WriteSectionHeaders ? sizeof(Elf_Shdr) : 0; - return Obj.SHOffset + size(Obj.sections()) * sizeof(Elf_Shdr) + + return Obj.SHOffset + Obj.sections().size() * sizeof(Elf_Shdr) + NullSectionSize; } @@ -1595,7 +1590,7 @@ // if we need large indexes or not. We can assign indexes first and check as // we go to see if we will actully need large indexes. bool NeedsLargeIndexes = false; - if (size(Obj.sections()) >= SHN_LORESERVE) { + if (Obj.sections().size() >= SHN_LORESERVE) { auto Sections = Obj.sections(); NeedsLargeIndexes = std::any_of(Sections.begin() + SHN_LORESERVE, Sections.end(),