Index: llvm/trunk/test/tools/llvm-ar/regex-cmd.test
===================================================================
--- llvm/trunk/test/tools/llvm-ar/regex-cmd.test
+++ llvm/trunk/test/tools/llvm-ar/regex-cmd.test
@@ -0,0 +1,7 @@
+RUN: yaml2obj %S/Inputs/elf.yaml -o %t.o
+
+RUN: rm -f %t.ar
+RUN: llvm-ar crs %t.ar %t.*
+RUN: llvm-ar tv %t.ar | FileCheck %s
+
+CHECK: regex-cmd.test{{.*}}.o
Index: llvm/trunk/tools/llvm-ar/llvm-ar.cpp
===================================================================
--- llvm/trunk/tools/llvm-ar/llvm-ar.cpp
+++ llvm/trunk/tools/llvm-ar/llvm-ar.cpp
@@ -31,6 +31,7 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/Process.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/ToolOutputFile.h"
@@ -869,7 +870,12 @@
       Stem.find("lib") != StringRef::npos)
     return libDriverMain(makeArrayRef(argv, argc));
 
-  for (int i = 1; i < argc; i++) {
+  SmallVector<const char *, 256> Argv;
+  SpecificBumpPtrAllocator<char> ArgAllocator;
+  failIfError(errorCodeToError(sys::Process::GetArgumentVector(
+      Argv, makeArrayRef(argv, argc), ArgAllocator)));
+
+  for (unsigned i = 1; i < Argv.size(); i++) {
     // If an argument starts with a dash and only contains chars
     // that belong to the options chars set, remove the dash.
     // We can't handle it after the command line options parsing
@@ -877,10 +883,10 @@
     // starting with a dash.
     // Make sure this doesn't match the actual llvm-ar specific options
     // that start with a dash.
-    StringRef S = argv[i];
+    StringRef S = Argv[i];
     if (S.startswith("-") &&
         S.find_first_not_of(OptionChars, 1) == StringRef::npos) {
-      argv[i]++;
+      Argv[i]++;
       break;
     }
     if (S == "--")
@@ -889,7 +895,7 @@
 
   // Have the command line options parsed and handle things
   // like --help and --version.
-  cl::ParseCommandLineOptions(argc, argv,
+  cl::ParseCommandLineOptions(Argv.size(), Argv.data(),
     "LLVM Archiver (llvm-ar)\n\n"
     "  This program archives bitcode files into single libraries\n"
   );