From 14f1b3e8826ce43b978db93a62d1166055db5394 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 2 Jan 2017 19:26:05 +0000
Subject: Vendor import of lldb trunk r290819:
 https://llvm.org/svn/llvm-project/lldb/trunk@290819

---
 source/Interpreter/OptionValueArgs.cpp | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'source/Interpreter/OptionValueArgs.cpp')

diff --git a/source/Interpreter/OptionValueArgs.cpp b/source/Interpreter/OptionValueArgs.cpp
index e28d884581fa..8edec77f9d2d 100644
--- a/source/Interpreter/OptionValueArgs.cpp
+++ b/source/Interpreter/OptionValueArgs.cpp
@@ -18,21 +18,13 @@
 using namespace lldb;
 using namespace lldb_private;
 
-size_t
-OptionValueArgs::GetArgs (Args &args)
-{
-    const uint32_t size = m_values.size();
-    std::vector<const char *> argv;
-    for (uint32_t i = 0; i<size; ++i)
-    {
-        const char *string_value = m_values[i]->GetStringValue ();
-        if (string_value)
-            argv.push_back(string_value);
-    }
+size_t OptionValueArgs::GetArgs(Args &args) {
+  args.Clear();
+  for (auto value : m_values) {
+    llvm::StringRef string_value = value->GetStringValue();
+    if (!string_value.empty())
+      args.AppendArgument(string_value);
+  }
 
-    if (argv.empty())
-        args.Clear();
-    else
-        args.SetArguments(argv.size(), &argv[0]);
-    return args.GetArgumentCount();
+  return args.GetArgumentCount();
 }
-- 
cgit v1.2.3