Revert "[llvm][tools] Hide unrelated llvm-cfi-verify options"

This reverts commit 7c63726072.

llvm/test/tools/llvm-cfi-verify/help.test

@@ -1,7 +0,0 @@
-# RUN: llvm-cfi-verify --help | FileCheck %s --check-prefix HELP --implicit-check-not='{{[Oo]}}ptions:'
-
-# HELP: OVERVIEW:
-# HELP: USAGE:
-# HELP: CFI Verify Options:
-# HELP: Color Options:
-# HELP: Generic Options:

llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp

@@ -32,24 +32,21 @@ using namespace llvm;
 using namespace llvm::object;
 using namespace llvm::cfi_verify;
 
-static cl::OptionCategory CFIVerifyCategory("CFI Verify Options");
-
 cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input file>"),
-                                   cl::Required, cl::cat(CFIVerifyCategory));
+                                   cl::Required);
 cl::opt<std::string> BlacklistFilename(cl::Positional,
                                        cl::desc("[blacklist file]"),
-                                       cl::init("-"),
-                                       cl::cat(CFIVerifyCategory));
+                                       cl::init("-"));
 cl::opt<bool> PrintGraphs(
     "print-graphs",
     cl::desc("Print graphs around indirect CF instructions in DOT format."),
-    cl::init(false), cl::cat(CFIVerifyCategory));
+    cl::init(false));
 cl::opt<unsigned> PrintBlameContext(
     "blame-context",
     cl::desc("Print the blame context (if possible) for BAD instructions. This "
              "specifies the number of lines of context to include, where zero "
              "disables this feature."),
-    cl::init(0), cl::cat(CFIVerifyCategory));
+    cl::init(0));
 cl::opt<unsigned> PrintBlameContextAll(
     "blame-context-all",
     cl::desc("Prints the blame context (if possible) for ALL instructions. "
@@ -57,9 +54,9 @@ cl::opt<unsigned> PrintBlameContextAll(
              "instructions (see --blame-context). If --blame-context is "
              "unspecified, it prints this number of contextual lines for BAD "
              "instructions as well."),
-    cl::init(0), cl::cat(CFIVerifyCategory));
+    cl::init(0));
 cl::opt<bool> Summarize("summarize", cl::desc("Print the summary only."),
-                        cl::init(false), cl::cat(CFIVerifyCategory));
+                        cl::init(false));
 
 ExitOnError ExitOnErr;
 
@@ -248,7 +245,6 @@ printIndirectCFInstructions(FileAnalysis &Analysis,
 }
 
 int main(int argc, char **argv) {
-  cl::HideUnrelatedOptions({&CFIVerifyCategory, &ColorCategory});
   cl::ParseCommandLineOptions(
       argc, argv,
       "Identifies whether Control Flow Integrity protects all indirect control "