https://github.com/quic-akaryaki updated https://github.com/llvm/llvm-project/pull/70710
>From 09e0f68c9402fa275b9706c96caf3c8bccbd8f52 Mon Sep 17 00:00:00 2001 From: Alexey Karyakin <akary...@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 000000000000000..7116ff39485562b --- /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 d33adb0b6a3e478..63c3873b1e94340 100644 --- a/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp +++ b/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp @@ -552,6 +552,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 9e7cd6266c941eb76aaf764728ce2313603e0e96 Mon Sep 17 00:00:00 2001 From: Alexey Karyakin <akary...@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 7116ff39485562b..4710d1078db0fe2 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 49c078a6970241fbdc9aa7e778345b365a196209 Mon Sep 17 00:00:00 2001 From: Alexey Karyakin <akary...@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 4710d1078db0fe2..8d2bb4476009d77 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)) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits