Skip to content

Commit ab58bcf

Browse files
[tools] Use llvm::append_range (NFC) (#135721)
1 parent 1cf9f76 commit ab58bcf

File tree

5 files changed

+17
-34
lines changed

5 files changed

+17
-34
lines changed

llvm/tools/llvm-debuginfo-analyzer/llvm-debuginfo-analyzer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ int main(int argc, char **argv) {
117117
std::vector<std::string> Objects;
118118
for (const std::string &Filename : InputFilenames) {
119119
std::vector<std::string> Objs = expandBundle(Filename);
120-
Objects.insert(Objects.end(), Objs.begin(), Objs.end());
120+
llvm::append_range(Objects, Objs);
121121
}
122122

123123
propagateOptions();

llvm/tools/llvm-nm/llvm-nm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2390,7 +2390,7 @@ exportSymbolNamesFromFiles(const std::vector<std::string> &InputFilenames) {
23902390
std::vector<NMSymbol> SymbolList;
23912391
for (const auto &FileName : InputFilenames) {
23922392
std::vector<NMSymbol> FileSymList = dumpSymbolNamesFromFile(FileName);
2393-
SymbolList.insert(SymbolList.end(), FileSymList.begin(), FileSymList.end());
2393+
llvm::append_range(SymbolList, FileSymList);
23942394
}
23952395

23962396
// Delete symbols which should not be printed from SymolList.

llvm/tools/llvm-objdump/llvm-objdump.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,8 +1575,7 @@ static void addSymbolizer(
15751575
ArrayRef<uint64_t> LabelAddrsRef = SymbolizerPtr->getReferencedAddresses();
15761576
// Copy and sort to remove duplicates.
15771577
std::vector<uint64_t> LabelAddrs;
1578-
LabelAddrs.insert(LabelAddrs.end(), LabelAddrsRef.begin(),
1579-
LabelAddrsRef.end());
1578+
llvm::append_range(LabelAddrs, LabelAddrsRef);
15801579
llvm::sort(LabelAddrs);
15811580
LabelAddrs.resize(llvm::unique(LabelAddrs) - LabelAddrs.begin());
15821581
// Add the labels.

llvm/tools/llvm-rc/llvm-rc.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ RcOptions parseWindresOptions(ArrayRef<const char *> ArgsArr,
371371
}
372372

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

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

521521
std::vector<std::string> InArgsInfo = InputArgs.getAllArgValues(OPT_INPUT);
522-
InArgsInfo.insert(InArgsInfo.end(), InputArgsArray.begin(),
523-
InputArgsArray.end());
522+
llvm::append_range(InArgsInfo, InputArgsArray);
524523
if (InArgsInfo.size() != 1) {
525524
fatalError("Exactly one input file should be provided.");
526525
}

llvm/tools/llvm-readobj/ELFDumper.cpp

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,38 +1371,30 @@ getSectionFlagsForTarget(unsigned EOSAbi, unsigned EMachine) {
13711371
std::end(ElfSectionFlags));
13721372
switch (EOSAbi) {
13731373
case ELFOSABI_SOLARIS:
1374-
Ret.insert(Ret.end(), std::begin(ElfSolarisSectionFlags),
1375-
std::end(ElfSolarisSectionFlags));
1374+
llvm::append_range(Ret, ElfSolarisSectionFlags);
13761375
break;
13771376
default:
1378-
Ret.insert(Ret.end(), std::begin(ElfGNUSectionFlags),
1379-
std::end(ElfGNUSectionFlags));
1377+
llvm::append_range(Ret, ElfGNUSectionFlags);
13801378
break;
13811379
}
13821380
switch (EMachine) {
13831381
case EM_AARCH64:
1384-
Ret.insert(Ret.end(), std::begin(ElfAArch64SectionFlags),
1385-
std::end(ElfAArch64SectionFlags));
1382+
llvm::append_range(Ret, ElfAArch64SectionFlags);
13861383
break;
13871384
case EM_ARM:
1388-
Ret.insert(Ret.end(), std::begin(ElfARMSectionFlags),
1389-
std::end(ElfARMSectionFlags));
1385+
llvm::append_range(Ret, ElfARMSectionFlags);
13901386
break;
13911387
case EM_HEXAGON:
1392-
Ret.insert(Ret.end(), std::begin(ElfHexagonSectionFlags),
1393-
std::end(ElfHexagonSectionFlags));
1388+
llvm::append_range(Ret, ElfHexagonSectionFlags);
13941389
break;
13951390
case EM_MIPS:
1396-
Ret.insert(Ret.end(), std::begin(ElfMipsSectionFlags),
1397-
std::end(ElfMipsSectionFlags));
1391+
llvm::append_range(Ret, ElfMipsSectionFlags);
13981392
break;
13991393
case EM_X86_64:
1400-
Ret.insert(Ret.end(), std::begin(ElfX86_64SectionFlags),
1401-
std::end(ElfX86_64SectionFlags));
1394+
llvm::append_range(Ret, ElfX86_64SectionFlags);
14021395
break;
14031396
case EM_XCORE:
1404-
Ret.insert(Ret.end(), std::begin(ElfXCoreSectionFlags),
1405-
std::end(ElfXCoreSectionFlags));
1397+
llvm::append_range(Ret, ElfXCoreSectionFlags);
14061398
break;
14071399
default:
14081400
break;
@@ -3497,20 +3489,13 @@ ELFDumper<ELFT>::getOtherFlagsFromSymbol(const Elf_Ehdr &Header,
34973489
// flag overlap with other ST_MIPS_xxx flags. So consider both
34983490
// cases separately.
34993491
if ((Symbol.st_other & STO_MIPS_MIPS16) == STO_MIPS_MIPS16)
3500-
SymOtherFlags.insert(SymOtherFlags.end(),
3501-
std::begin(ElfMips16SymOtherFlags),
3502-
std::end(ElfMips16SymOtherFlags));
3492+
llvm::append_range(SymOtherFlags, ElfMips16SymOtherFlags);
35033493
else
3504-
SymOtherFlags.insert(SymOtherFlags.end(),
3505-
std::begin(ElfMipsSymOtherFlags),
3506-
std::end(ElfMipsSymOtherFlags));
3494+
llvm::append_range(SymOtherFlags, ElfMipsSymOtherFlags);
35073495
} else if (Header.e_machine == EM_AARCH64) {
3508-
SymOtherFlags.insert(SymOtherFlags.end(),
3509-
std::begin(ElfAArch64SymOtherFlags),
3510-
std::end(ElfAArch64SymOtherFlags));
3496+
llvm::append_range(SymOtherFlags, ElfAArch64SymOtherFlags);
35113497
} else if (Header.e_machine == EM_RISCV) {
3512-
SymOtherFlags.insert(SymOtherFlags.end(), std::begin(ElfRISCVSymOtherFlags),
3513-
std::end(ElfRISCVSymOtherFlags));
3498+
llvm::append_range(SymOtherFlags, ElfRISCVSymOtherFlags);
35143499
}
35153500
return SymOtherFlags;
35163501
}

0 commit comments

Comments
 (0)