[PATCH] D102665: [llvm-objcopy] Add support for '--' for delimiting options from input/output files

[Sergey Dmitriev via Phabricator via llvm-commits]

sdmitriev updated this revision to Diff 346106.
sdmitriev marked an inline comment as done.
sdmitriev added a comment.

Addressed review comments.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D102665/new/

https://reviews.llvm.org/D102665

Files:
  llvm/test/tools/llvm-objcopy/objcopy-dash-dash.test
  llvm/test/tools/llvm-objcopy/tool-help-message.test
  llvm/tools/llvm-objcopy/CopyConfig.cpp


Index: llvm/tools/llvm-objcopy/CopyConfig.cpp
===================================================================
--- llvm/tools/llvm-objcopy/CopyConfig.cpp
+++ llvm/tools/llvm-objcopy/CopyConfig.cpp
@@ -470,15 +470,23 @@
 // help flag is set then ParseObjcopyOptions will print the help messege and
 // exit.
 Expected<DriverConfig>
-parseObjcopyOptions(ArrayRef<const char *> ArgsArr,
+parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
                     llvm::function_ref<Error(Error)> ErrorCallback) {
   DriverConfig DC;
   ObjcopyOptTable T;
+
+  const char *const *DashDash =
+      std::find_if(RawArgsArr.begin(), RawArgsArr.end(),
+                   [](StringRef Str) { return Str == "--"; });
+  ArrayRef<const char *> ArgsArr = makeArrayRef(RawArgsArr.begin(), DashDash);
+  if (DashDash != RawArgsArr.end())
+    DashDash = std::next(DashDash);
+
   unsigned MissingArgumentIndex, MissingArgumentCount;
   llvm::opt::InputArgList InputArgs =
       T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
 
-  if (InputArgs.size() == 0) {
+  if (InputArgs.size() == 0 && DashDash == RawArgsArr.end()) {
     printHelp(T, errs(), ToolType::Objcopy);
     exit(1);
   }
@@ -502,6 +510,7 @@
 
   for (auto Arg : InputArgs.filtered(OBJCOPY_INPUT))
     Positional.push_back(Arg->getValue());
+  std::copy(DashDash, RawArgsArr.end(), std::back_inserter(Positional));
 
   if (Positional.empty())
     return createStringError(errc::invalid_argument, "no input file specified");
Index: llvm/test/tools/llvm-objcopy/tool-help-message.test
===================================================================
--- llvm/test/tools/llvm-objcopy/tool-help-message.test
+++ llvm/test/tools/llvm-objcopy/tool-help-message.test
@@ -1,6 +1,7 @@
 # RUN: llvm-objcopy -h | FileCheck --check-prefix=OBJCOPY-USAGE %s --match-full-lines
 # RUN: llvm-objcopy --help | FileCheck --check-prefix=OBJCOPY-USAGE %s --match-full-lines
 # RUN: not llvm-objcopy 2>&1 | FileCheck --check-prefix=OBJCOPY-USAGE %s --match-full-lines
+# RUN: not llvm-objcopy -- 2>&1 | FileCheck --check-prefix=OBJCOPY-USAGE %s --match-full-lines
 # RUN: not llvm-objcopy -abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s
 # RUN: not llvm-objcopy --abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s
 # RUN: not llvm-objcopy --strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES
Index: llvm/test/tools/llvm-objcopy/objcopy-dash-dash.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-objcopy/objcopy-dash-dash.test
@@ -0,0 +1,23 @@
+# Create a clean temporary directory and cd to it to use relative paths.
+# RUN: rm -rf %t && mkdir %t && cd %t
+
+# Check that llvm-objcopy works correctly with input/output file names staring
+# with dash separated by '--' from options.
+# RUN: yaml2obj %s -o -in-obj
+# RUN: llvm-objcopy --only-section=.test -- -in-obj -out-obj
+# RUN: llvm-readobj --file-headers --sections -- -out-obj | FileCheck %s
+
+!ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .test
+    Type:            SHT_PROGBITS
+    Flags:           [ ]
+
+# CHECK: SectionHeaderCount: 3
+# CHECK: Name: .test
+# CHECK: Name: .shstrtab


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D102665.346106.patch
Type: text/x-patch
Size: 3321 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210518/d2092c1d/attachment.bin>