[Lldb-commits] [lldb] 875654f - Fix VSCode/TestOptions.test

[Walter Erquinigo via lldb-commits]

Author: Walter Erquinigo
Date: 2021-04-21T15:46:26-07:00
New Revision: 875654f897ac01ad91a1a5f5dc23d07ac548a0e0

URL: https://github.com/llvm/llvm-project/commit/875654f897ac01ad91a1a5f5dc23d07ac548a0e0
DIFF: https://github.com/llvm/llvm-project/commit/875654f897ac01ad91a1a5f5dc23d07ac548a0e0.diff

LOG: Fix VSCode/TestOptions.test

Found by https://lab.llvm.org/buildbot/#/builders/96/builds/6936

Added: 
    

Modified: 
    lldb/tools/lldb-vscode/lldb-vscode.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/tools/lldb-vscode/lldb-vscode.cpp b/lldb/tools/lldb-vscode/lldb-vscode.cpp
index 95074bb1c984..5f9e96bf6f50 100644
--- a/lldb/tools/lldb-vscode/lldb-vscode.cpp
+++ b/lldb/tools/lldb-vscode/lldb-vscode.cpp
@@ -3158,6 +3158,11 @@ int main(int argc, char *argv[]) {
   llvm::ArrayRef<const char *> ArgsArr = llvm::makeArrayRef(argv + 1, argc);
   llvm::opt::InputArgList input_args = T.ParseArgs(ArgsArr, MAI, MAC);
 
+  if (input_args.hasArg(OPT_help)) {
+    printHelp(T, llvm::sys::path::filename(argv[0]));
+    return EXIT_SUCCESS;
+  }
+
   if (llvm::opt::Arg *target_arg = input_args.getLastArg(OPT_launch_target)) {
     if (llvm::opt::Arg *comm_file = input_args.getLastArg(OPT_comm_file)) {
       int target_args_pos = argc;
@@ -3189,11 +3194,6 @@ int main(int argc, char *argv[]) {
 
   int portno = -1;
 
-  if (input_args.hasArg(OPT_help)) {
-    printHelp(T, llvm::sys::path::filename(argv[0]));
-    return EXIT_SUCCESS;
-  }
-
   if (auto *arg = input_args.getLastArg(OPT_port)) {
     auto optarg = arg->getValue();
     char *remainder;