diff options
| -rw-r--r-- | llvm/test/tools/llvm-ar/regex-cmd.test | 7 | ||||
| -rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/llvm/test/tools/llvm-ar/regex-cmd.test b/llvm/test/tools/llvm-ar/regex-cmd.test new file mode 100644 index 00000000000..427edd4a4fe --- /dev/null +++ b/llvm/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 diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index a77845a66c8..4b80ad1bb5b 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/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 @@ int main(int argc, char **argv) { 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 @@ int main(int argc, char **argv) { // 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 @@ int main(int argc, char **argv) { // 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" ); |
