Skip to content

[tools] Use llvm::append_range (NFC) #135721

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.

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ int main(int argc, char **argv) {
std::vector<std::string> Objects;
for (const std::string &Filename : InputFilenames) {
std::vector<std::string> Objs = expandBundle(Filename);
Objects.insert(Objects.end(), Objs.begin(), Objs.end());
llvm::append_range(Objects, Objs);
}

propagateOptions();
Expand Down
2 changes: 1 addition & 1 deletion llvm/tools/llvm-nm/llvm-nm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2390,7 +2390,7 @@ exportSymbolNamesFromFiles(const std::vector<std::string> &InputFilenames) {
std::vector<NMSymbol> SymbolList;
for (const auto &FileName : InputFilenames) {
std::vector<NMSymbol> FileSymList = dumpSymbolNamesFromFile(FileName);
SymbolList.insert(SymbolList.end(), FileSymList.begin(), FileSymList.end());
llvm::append_range(SymbolList, FileSymList);
}

// Delete symbols which should not be printed from SymolList.
Expand Down
3 changes: 1 addition & 2 deletions llvm/tools/llvm-objdump/llvm-objdump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1575,8 +1575,7 @@ static void addSymbolizer(
ArrayRef<uint64_t> LabelAddrsRef = SymbolizerPtr->getReferencedAddresses();
// Copy and sort to remove duplicates.
std::vector<uint64_t> LabelAddrs;
LabelAddrs.insert(LabelAddrs.end(), LabelAddrsRef.begin(),
LabelAddrsRef.end());
llvm::append_range(LabelAddrs, LabelAddrsRef);
llvm::sort(LabelAddrs);
LabelAddrs.resize(llvm::unique(LabelAddrs) - LabelAddrs.begin());
// Add the labels.
Expand Down
5 changes: 2 additions & 3 deletions llvm/tools/llvm-rc/llvm-rc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ RcOptions parseWindresOptions(ArrayRef<const char *> ArgsArr,
}

std::vector<std::string> FileArgs = InputArgs.getAllArgValues(WINDRES_INPUT);
FileArgs.insert(FileArgs.end(), InputArgsArray.begin(), InputArgsArray.end());
llvm::append_range(FileArgs, InputArgsArray);

if (InputArgs.hasArg(WINDRES_input)) {
Opts.InputFile = InputArgs.getLastArgValue(WINDRES_input).str();
Expand Down Expand Up @@ -519,8 +519,7 @@ RcOptions parseRcOptions(ArrayRef<const char *> ArgsArr,
}

std::vector<std::string> InArgsInfo = InputArgs.getAllArgValues(OPT_INPUT);
InArgsInfo.insert(InArgsInfo.end(), InputArgsArray.begin(),
InputArgsArray.end());
llvm::append_range(InArgsInfo, InputArgsArray);
if (InArgsInfo.size() != 1) {
fatalError("Exactly one input file should be provided.");
}
Expand Down
39 changes: 12 additions & 27 deletions llvm/tools/llvm-readobj/ELFDumper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1371,38 +1371,30 @@ getSectionFlagsForTarget(unsigned EOSAbi, unsigned EMachine) {
std::end(ElfSectionFlags));
switch (EOSAbi) {
case ELFOSABI_SOLARIS:
Ret.insert(Ret.end(), std::begin(ElfSolarisSectionFlags),
std::end(ElfSolarisSectionFlags));
llvm::append_range(Ret, ElfSolarisSectionFlags);
break;
default:
Ret.insert(Ret.end(), std::begin(ElfGNUSectionFlags),
std::end(ElfGNUSectionFlags));
llvm::append_range(Ret, ElfGNUSectionFlags);
break;
}
switch (EMachine) {
case EM_AARCH64:
Ret.insert(Ret.end(), std::begin(ElfAArch64SectionFlags),
std::end(ElfAArch64SectionFlags));
llvm::append_range(Ret, ElfAArch64SectionFlags);
break;
case EM_ARM:
Ret.insert(Ret.end(), std::begin(ElfARMSectionFlags),
std::end(ElfARMSectionFlags));
llvm::append_range(Ret, ElfARMSectionFlags);
break;
case EM_HEXAGON:
Ret.insert(Ret.end(), std::begin(ElfHexagonSectionFlags),
std::end(ElfHexagonSectionFlags));
llvm::append_range(Ret, ElfHexagonSectionFlags);
break;
case EM_MIPS:
Ret.insert(Ret.end(), std::begin(ElfMipsSectionFlags),
std::end(ElfMipsSectionFlags));
llvm::append_range(Ret, ElfMipsSectionFlags);
break;
case EM_X86_64:
Ret.insert(Ret.end(), std::begin(ElfX86_64SectionFlags),
std::end(ElfX86_64SectionFlags));
llvm::append_range(Ret, ElfX86_64SectionFlags);
break;
case EM_XCORE:
Ret.insert(Ret.end(), std::begin(ElfXCoreSectionFlags),
std::end(ElfXCoreSectionFlags));
llvm::append_range(Ret, ElfXCoreSectionFlags);
break;
default:
break;
Expand Down Expand Up @@ -3497,20 +3489,13 @@ ELFDumper<ELFT>::getOtherFlagsFromSymbol(const Elf_Ehdr &Header,
// flag overlap with other ST_MIPS_xxx flags. So consider both
// cases separately.
if ((Symbol.st_other & STO_MIPS_MIPS16) == STO_MIPS_MIPS16)
SymOtherFlags.insert(SymOtherFlags.end(),
std::begin(ElfMips16SymOtherFlags),
std::end(ElfMips16SymOtherFlags));
llvm::append_range(SymOtherFlags, ElfMips16SymOtherFlags);
else
SymOtherFlags.insert(SymOtherFlags.end(),
std::begin(ElfMipsSymOtherFlags),
std::end(ElfMipsSymOtherFlags));
llvm::append_range(SymOtherFlags, ElfMipsSymOtherFlags);
} else if (Header.e_machine == EM_AARCH64) {
SymOtherFlags.insert(SymOtherFlags.end(),
std::begin(ElfAArch64SymOtherFlags),
std::end(ElfAArch64SymOtherFlags));
llvm::append_range(SymOtherFlags, ElfAArch64SymOtherFlags);
} else if (Header.e_machine == EM_RISCV) {
SymOtherFlags.insert(SymOtherFlags.end(), std::begin(ElfRISCVSymOtherFlags),
std::end(ElfRISCVSymOtherFlags));
llvm::append_range(SymOtherFlags, ElfRISCVSymOtherFlags);
}
return SymOtherFlags;
}
Expand Down
Loading