[PATCH] D31409: [XRay][tools] Handle "no subcommand" case for llvm-xray
Dean Michael Berris via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 28 22:08:19 PDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL298975: [XRay][tools] Handle "no subcommand" case for llvm-xray (authored by dberris).
Changed prior to commit:
https://reviews.llvm.org/D31409?vs=93339&id=93340#toc
Repository:
rL LLVM
https://reviews.llvm.org/D31409
Files:
llvm/trunk/test/tools/llvm-xray/X86/no-subcommand-noassert.txt
llvm/trunk/tools/llvm-xray/llvm-xray.cc
Index: llvm/trunk/tools/llvm-xray/llvm-xray.cc
===================================================================
--- llvm/trunk/tools/llvm-xray/llvm-xray.cc
+++ llvm/trunk/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: llvm/trunk/test/tools/llvm-xray/X86/no-subcommand-noassert.txt
===================================================================
--- llvm/trunk/test/tools/llvm-xray/X86/no-subcommand-noassert.txt
+++ llvm/trunk/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.93340.patch
Type: text/x-patch
Size: 1273 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170329/55827c60/attachment.bin>
More information about the llvm-commits
mailing list