[PATCH] D31409: [XRay][tools] Handle "no subcommand" case for llvm-xray

[Dean Michael Berris via Phabricator via llvm-commits]

dberris created this revision.

Currently the llvm-xray commandline tool fails to handle the case for
when no subcommand is provided in a graceful manner. This fixes that to
print the help message explaining the subcommands and the available
options.


https://reviews.llvm.org/D31409

Files:
  tools/llvm-xray/llvm-xray.cc


Index: tools/llvm-xray/llvm-xray.cc
===================================================================
--- tools/llvm-xray/llvm-xray.cc
+++ tools/llvm-xray/llvm-xray.cc
@@ -30,12 +30,20 @@
                               "  This program consolidates multiple XRay trace "
                               "processing tools for convenient access.\n");
   for (auto *SC : cl::getRegisteredSubcommands()) {
-    if (*SC)
+    if (*SC) {
+      // If no subcommand was provided, we need to explicitly check if this is
+      // the top-level subcommand.
+      if (SC == &*cl::TopLevelSubCommand) {
+        cl::PrintHelpMessage(false, true);
+        return 1;
+      }
       if (auto C = dispatch(SC)) {
         ExitOnError("llvm-xray: ")(C());
         return 0;
       }
+    }
   }
 
+  // If all else fails, we still print the usage message.
   cl::PrintHelpMessage(false, true);
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31409.93193.patch
Type: text/x-patch
Size: 885 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170327/be999bf7/attachment.bin>