diff options
| -rw-r--r-- | llvm/test/tools/llvm-xray/X86/no-subcommand-noassert.txt | 3 | ||||
| -rw-r--r-- | llvm/tools/llvm-xray/llvm-xray.cc | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/llvm/test/tools/llvm-xray/X86/no-subcommand-noassert.txt b/llvm/test/tools/llvm-xray/X86/no-subcommand-noassert.txt new file mode 100644 index 00000000000..3de328d73a4 --- /dev/null +++ b/llvm/test/tools/llvm-xray/X86/no-subcommand-noassert.txt @@ -0,0 +1,3 @@ +; RUN: llvm-xray | FileCheck %s + +; CHECK: OVERVIEW: XRay Tools diff --git a/llvm/tools/llvm-xray/llvm-xray.cc b/llvm/tools/llvm-xray/llvm-xray.cc index ac5faaa408b..98303e7be15 100644 --- a/llvm/tools/llvm-xray/llvm-xray.cc +++ b/llvm/tools/llvm-xray/llvm-xray.cc @@ -30,12 +30,20 @@ int main(int argc, char *argv[]) { " 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); } |
