[llvm] [llvm-objcopy] Check for missing argument values (PR #70710)

[Alexey Karyakin via llvm-commits]

https://github.com/quic-akaryaki updated https://github.com/llvm/llvm-project/pull/70710

>From da3cdfce96cb4b65fcffb30478b50182fe41dbb2 Mon Sep 17 00:00:00 2001
From: Alexey Karyakin <akaryaki at quicinc.com>
Date: Mon, 30 Oct 2023 11:50:00 -0700
Subject: [PATCH 1/3] [llvm-objcopy] Check for missing argument values

Report an error if a required value for a command line argument
is missing.
---
 llvm/test/tools/llvm-objcopy/tool-options.test | 4 ++++
 llvm/tools/llvm-objcopy/ObjcopyOptions.cpp     | 6 ++++++
 2 files changed, 10 insertions(+)
 create mode 100644 llvm/test/tools/llvm-objcopy/tool-options.test

diff --git a/llvm/test/tools/llvm-objcopy/tool-options.test b/llvm/test/tools/llvm-objcopy/tool-options.test
new file mode 100644
index 0000000000000..7116ff3948556
--- /dev/null
+++ b/llvm/test/tools/llvm-objcopy/tool-options.test
@@ -0,0 +1,4 @@
+## An error must be reported if a required argument value is missing.
+# RUN: not llvm-objcopy --only-section 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE %s
+# RUN: not llvm-objcopy -O 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE %s
+# CHECK-NO-VALUE: error: argument to '{{.*}}' is missing
diff --git a/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp b/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp
index a1897334cff2e..4ab3b7265f2f6 100644
--- a/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp
+++ b/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp
@@ -571,6 +571,12 @@ objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
   llvm::opt::InputArgList InputArgs =
       T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
 
+  if (MissingArgumentCount)
+    return createStringError(
+        errc::invalid_argument,
+        "argument to '%s' is missing (expected %d value(s))",
+        InputArgs.getArgString(MissingArgumentIndex), MissingArgumentCount);
+
   if (InputArgs.size() == 0 && DashDash == RawArgsArr.end()) {
     printHelp(T, errs(), ToolType::Objcopy);
     exit(1);

>From 663dc64cc3c43121a51ce337e9dddea232ca0fa3 Mon Sep 17 00:00:00 2001
From: Alexey Karyakin <akaryaki at quicinc.com>
Date: Mon, 6 Nov 2023 08:01:38 -0800
Subject: [PATCH 2/3] Explcitly check for argument name in the test.

---
 llvm/test/tools/llvm-objcopy/tool-options.test | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/llvm/test/tools/llvm-objcopy/tool-options.test b/llvm/test/tools/llvm-objcopy/tool-options.test
index 7116ff3948556..4710d1078db0f 100644
--- a/llvm/test/tools/llvm-objcopy/tool-options.test
+++ b/llvm/test/tools/llvm-objcopy/tool-options.test
@@ -1,4 +1,6 @@
 ## An error must be reported if a required argument value is missing.
-# RUN: not llvm-objcopy --only-section 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE %s
-# RUN: not llvm-objcopy -O 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE %s
-# CHECK-NO-VALUE: error: argument to '{{.*}}' is missing
+# RUN: not llvm-objcopy --only-section 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE-ONLY-SECTION %s
+# CHECK-NO-VALUE-ONLY-SECTION: error: argument to '--only-section' is missing
+
+# RUN: not llvm-objcopy -O 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE-O %s
+# CHECK-NO-VALUE-O: error: argument to '-O' is missing

>From 6f5a5c1af5c1fec536ebfced02d80cab988cec4c Mon Sep 17 00:00:00 2001
From: Alexey Karyakin <akaryaki at quicinc.com>
Date: Mon, 13 Nov 2023 11:28:09 -0800
Subject: [PATCH 3/3] Add the number of missing arguments in the test for
 checking.

---
 llvm/test/tools/llvm-objcopy/tool-options.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm/test/tools/llvm-objcopy/tool-options.test b/llvm/test/tools/llvm-objcopy/tool-options.test
index 4710d1078db0f..8d2bb4476009d 100644
--- a/llvm/test/tools/llvm-objcopy/tool-options.test
+++ b/llvm/test/tools/llvm-objcopy/tool-options.test
@@ -1,6 +1,6 @@
 ## An error must be reported if a required argument value is missing.
 # RUN: not llvm-objcopy --only-section 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE-ONLY-SECTION %s
-# CHECK-NO-VALUE-ONLY-SECTION: error: argument to '--only-section' is missing
+# CHECK-NO-VALUE-ONLY-SECTION: error: argument to '--only-section' is missing (expected 1 value(s))
 
 # RUN: not llvm-objcopy -O 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE-O %s
-# CHECK-NO-VALUE-O: error: argument to '-O' is missing
+# CHECK-NO-VALUE-O: error: argument to '-O' is missing (expected 1 value(s))