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

[Dean Michael Berris via Phabricator via llvm-commits]

dberris updated this revision to Diff 93339.
dberris added a comment.

- fixup: add a test


https://reviews.llvm.org/D31409

Files:
  test/tools/llvm-xray/X86/no-subcommand-noassert.txt
  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 0;
+      }
       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);
 }
Index: test/tools/llvm-xray/X86/no-subcommand-noassert.txt
===================================================================
--- /dev/null
+++ test/tools/llvm-xray/X86/no-subcommand-noassert.txt
@@ -0,0 +1,3 @@
+; RUN: llvm-xray | FileCheck %s
+
+; CHECK:  OVERVIEW: XRay Tools


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31409.93339.patch
Type: text/x-patch
Size: 1165 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170329/84a8fb77/attachment.bin>