[llvm] [tools] Use llvm::append_range (NFC) (PR #135721)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Apr 14 18:36:44 PDT 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-llvm-binary-utilities
@llvm/pr-subscribers-debuginfo
Author: Kazu Hirata (kazutakahirata)
<details>
<summary>Changes</summary>
---
Full diff: https://github.com/llvm/llvm-project/pull/135721.diff
5 Files Affected:
- (modified) llvm/tools/llvm-debuginfo-analyzer/llvm-debuginfo-analyzer.cpp (+1-1)
- (modified) llvm/tools/llvm-nm/llvm-nm.cpp (+1-1)
- (modified) llvm/tools/llvm-objdump/llvm-objdump.cpp (+1-2)
- (modified) llvm/tools/llvm-rc/llvm-rc.cpp (+2-3)
- (modified) llvm/tools/llvm-readobj/ELFDumper.cpp (+12-27)
``````````diff
diff --git a/llvm/tools/llvm-debuginfo-analyzer/llvm-debuginfo-analyzer.cpp b/llvm/tools/llvm-debuginfo-analyzer/llvm-debuginfo-analyzer.cpp
index 0ce8e1e9e99f0..a5e2d39f67d7f 100644
--- a/llvm/tools/llvm-debuginfo-analyzer/llvm-debuginfo-analyzer.cpp
+++ b/llvm/tools/llvm-debuginfo-analyzer/llvm-debuginfo-analyzer.cpp
@@ -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();
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index e7c3e36dd38d2..ff07fbbaa5351 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -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.
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index c62ebbae55885..5c84fd5380c4d 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -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.
diff --git a/llvm/tools/llvm-rc/llvm-rc.cpp b/llvm/tools/llvm-rc/llvm-rc.cpp
index 6feadc5f259b3..73621543848a1 100644
--- a/llvm/tools/llvm-rc/llvm-rc.cpp
+++ b/llvm/tools/llvm-rc/llvm-rc.cpp
@@ -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();
@@ -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.");
}
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index d01cab211afd7..abaf6077ba9e7 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -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;
@@ -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;
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/135721
More information about the llvm-commits
mailing list