From 441650d5893001f18a0bb9440ea32f6bd2039196 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu@google.com>
Date: Tue, 5 Jan 2021 21:15:56 -0800
Subject: [PATCH] [tools] Use llvm::append_range (NFC)

---
 llvm/tools/bugpoint/ToolRunner.cpp               | 2 +-
 llvm/tools/llvm-cat/llvm-cat.cpp                 | 3 +--
 llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp     | 2 +-
 llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp | 4 +---
 llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp       | 2 +-
 llvm/tools/llvm-stress/llvm-stress.cpp           | 3 +--
 llvm/tools/llvm-xray/xray-graph.cpp              | 3 +--
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/llvm/tools/bugpoint/ToolRunner.cpp b/llvm/tools/bugpoint/ToolRunner.cpp
index d880aca..c4ea1da 100644
--- a/llvm/tools/bugpoint/ToolRunner.cpp
+++ b/llvm/tools/bugpoint/ToolRunner.cpp
@@ -495,7 +495,7 @@ Expected<int> LLC::ExecuteProgram(const std::string &Bitcode,
     return std::move(E);
 
   std::vector<std::string> CCArgs(ArgsForCC);
-  CCArgs.insert(CCArgs.end(), SharedLibs.begin(), SharedLibs.end());
+  llvm::append_range(CCArgs, SharedLibs);
 
   // Assuming LLC worked, compile the result with CC and run it.
   return cc->ExecuteProgram(OutputAsmFile, Args, *FileKind, InputFile,
diff --git a/llvm/tools/llvm-cat/llvm-cat.cpp b/llvm/tools/llvm-cat/llvm-cat.cpp
index 85f2b41..39848e5 100644
--- a/llvm/tools/llvm-cat/llvm-cat.cpp
+++ b/llvm/tools/llvm-cat/llvm-cat.cpp
@@ -62,8 +62,7 @@ int main(int argc, char **argv) {
           errorOrToExpected(MemoryBuffer::getFileOrSTDIN(InputFilename)));
       std::vector<BitcodeModule> Mods = ExitOnErr(getBitcodeModuleList(*MB));
       for (auto &BitcodeMod : Mods) {
-        Buffer.insert(Buffer.end(), BitcodeMod.getBuffer().begin(),
-                      BitcodeMod.getBuffer().end());
+        llvm::append_range(Buffer, BitcodeMod.getBuffer());
         Writer.copyStrtab(BitcodeMod.getStrtab());
       }
     }
diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index abaf314..4322f12 100644
--- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -670,7 +670,7 @@ int main(int argc, char **argv) {
   std::vector<std::string> Objects;
   for (const auto &F : InputFilenames) {
     auto Objs = expandBundle(F);
-    Objects.insert(Objects.end(), Objs.begin(), Objs.end());
+    llvm::append_range(Objects, Objs);
   }
 
   bool Success = true;
diff --git a/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp b/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp
index 2304e91..f3ce184 100644
--- a/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp
+++ b/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp
@@ -182,9 +182,7 @@ Expected<InstructionBenchmark> BenchmarkRunner::runConfiguration(
       const ExecutableFunction EF(State.createTargetMachine(),
                                   getObjectFromBuffer(OS.str()));
       const auto FnBytes = EF.getFunctionBytes();
-      InstrBenchmark.AssembledSnippet.insert(
-          InstrBenchmark.AssembledSnippet.end(), FnBytes.begin(),
-          FnBytes.end());
+      llvm::append_range(InstrBenchmark.AssembledSnippet, FnBytes);
     }
 
     // Assemble NumRepetitions instructions repetitions of the snippet for
diff --git a/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp b/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
index b1dd548..155eee0 100644
--- a/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
+++ b/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
@@ -416,7 +416,7 @@ static llvm::Error convertFileToGSYM(raw_ostream &OS) {
   OS << "Input file: " << ConvertFilename << "\n";
 
   auto Objs = expandBundle(ConvertFilename);
-  Objects.insert(Objects.end(), Objs.begin(), Objs.end());
+  llvm::append_range(Objects, Objs);
 
   for (auto Object : Objects) {
     if (auto Err = handleFileConversionToGSYM(Object, OutFile))
diff --git a/llvm/tools/llvm-stress/llvm-stress.cpp b/llvm/tools/llvm-stress/llvm-stress.cpp
index 10ebc1f..538240d 100644
--- a/llvm/tools/llvm-stress/llvm-stress.cpp
+++ b/llvm/tools/llvm-stress/llvm-stress.cpp
@@ -315,8 +315,7 @@ protected:
         Type::getFloatTy(Context),
         Type::getDoubleTy(Context)
       });
-      ScalarTypes.insert(ScalarTypes.end(),
-        AdditionalScalarTypes.begin(), AdditionalScalarTypes.end());
+      llvm::append_range(ScalarTypes, AdditionalScalarTypes);
     }
 
     return ScalarTypes[getRandom() % ScalarTypes.size()];
diff --git a/llvm/tools/llvm-xray/xray-graph.cpp b/llvm/tools/llvm-xray/xray-graph.cpp
index 522609b..00a1807 100644
--- a/llvm/tools/llvm-xray/xray-graph.cpp
+++ b/llvm/tools/llvm-xray/xray-graph.cpp
@@ -312,8 +312,7 @@ void GraphRenderer::calculateVertexStatistics() {
     if (V.first != 0) {
       for (auto &E : G.inEdges(V.first)) {
         auto &A = E.second;
-        TempTimings.insert(TempTimings.end(), A.Timings.begin(),
-                           A.Timings.end());
+        llvm::append_range(TempTimings, A.Timings);
       }
       getStats(TempTimings.begin(), TempTimings.end(), G[V.first].S);
       updateMaxStats(G[V.first].S, G.GraphVertexMax);
-- 
2.7.4