-help output cleanup

driver/cl_options.cpp

@@ -28,7 +28,7 @@ cl::list<std::string> fileList(
     cl::Positional, cl::desc("files"));
 
 cl::list<std::string> runargs("run",
-    cl::desc("program args..."),
+    cl::desc("Runs the resulting program, passing the remaining arguments to it"),
     cl::Positional,
     cl::PositionalEatsArgs);
 
@@ -165,11 +165,11 @@ cl::opt<std::string> ddocFile("Df",
 
 // Json options
 static cl::opt<bool, true> doJson("X",
-    cl::desc("generate JSON file"),
+    cl::desc("Generate JSON file"),
     cl::location(global.params.doXGeneration));
 
 cl::opt<std::string> jsonFile("Xf",
-    cl::desc("write JSON file to <filename>"),
+    cl::desc("Write JSON file to <filename>"),
     cl::value_desc("filename"),
     cl::Prefix);
 
@@ -206,7 +206,7 @@ static cl::list<std::string, StringsAdapter> stringImportPaths("J",
     cl::Prefix);
 
 static cl::opt<bool, true> addMain("main",
-    cl::desc("add empty main() (e.g. for unittesting)"),
+    cl::desc("Add empty main() (e.g. for unittesting)"),
     cl::ZeroOrMore,
     cl::location(global.params.addMain));
 

driver/main.cpp

@@ -141,6 +141,59 @@ static void initFromString(char*& dest, const cl::opt<std::string>& src) {
     }
 }
 
+
+#if LDC_LLVM_VER >= 303
+static void hide(llvm::StringMap<cl::Option *>& map, const char* name) {
+    // Check if option exists first for resilience against LLVM changes
+    // between versions.
+    if (map.count(name))
+        map[name]->setHiddenFlag(cl::Hidden);
+}
+
+/// Removes command line options exposed from within LLVM that are unlikely
+/// to be useful for end users from the -help output.
+static void hideLLVMOptions() {
+    llvm::StringMap<cl::Option *> map;
+    cl::getRegisteredOptions(map);
+    hide(map, "bounds-checking-single-trap");
+    hide(map, "disable-spill-fusing");
+    hide(map, "enable-correct-eh-support");
+    hide(map, "enable-load-pre");
+    hide(map, "enable-objc-arc-opts");
+    hide(map, "enable-tbaa");
+    hide(map, "fatal-assembler-warnings");
+    hide(map, "internalize-public-api-file");
+    hide(map, "internalize-public-api-list");
+    hide(map, "join-liveintervals");
+    hide(map, "limit-float-precision");
+    hide(map, "mc-x86-disable-arith-relaxation");
+    hide(map, "pre-RA-sched");
+    hide(map, "print-after-all");
+    hide(map, "print-before-all");
+    hide(map, "print-machineinstrs");
+    hide(map, "profile-estimator-loop-weight");
+    hide(map, "profile-estimator-loop-weight");
+    hide(map, "profile-file");
+    hide(map, "profile-info-file");
+    hide(map, "profile-verifier-noassert");
+    hide(map, "regalloc");
+    hide(map, "shrink-wrap");
+    hide(map, "spiller");
+    hide(map, "stats");
+    hide(map, "strip-debug");
+    hide(map, "struct-path-tbaa");
+    hide(map, "time-passes");
+    hide(map, "unit-at-a-time");
+    hide(map, "verify-dom-info");
+    hide(map, "verify-loop-info");
+    hide(map, "verify-regalloc");
+    hide(map, "verify-region-info");
+    hide(map, "verify-scev");
+    hide(map, "x86-early-ifcvt");
+    hide(map, "x86-use-vzeroupper");
+}
+#endif
+
 int main(int argc, char **argv);
 
 /// Parses switches from the command line, any response files and the global
@@ -195,6 +248,9 @@ static void parseCommandLine(int argc, char **argv, Strings &sourceFiles, bool &
 
     // Handle fixed-up arguments!
     cl::SetVersionPrinter(&printVersion);
+#if LDC_LLVM_VER >= 303
+    hideLLVMOptions();
+#endif
     cl::ParseCommandLineOptions(final_args.size(), const_cast<char**>(&final_args[0]),
         "LDC - the LLVM D compiler\n"
 #if LDC_LLVM_VER < 302

gen/logger.cpp

@@ -50,7 +50,7 @@ namespace Logger
     static std::string indent_str;
 
     llvm::cl::opt<bool> _enabled("vv",
-        llvm::cl::desc("Very verbose"),
+        llvm::cl::desc("Print front-end/glue code debug log"),
         llvm::cl::ZeroOrMore);
 
     void indent()