Revert "[CommandLine] Avoid ManagedStatic.h include (NFC)"

This reverts commit 82c97bd.

Reason for revert: <missing kfdtest fix>

Change-Id: Ia03779380b149b7bbf011b6ad61354afb907cb25

clang/lib/Frontend/PrecompiledPreamble.cpp

@@ -28,7 +28,6 @@
 #include "llvm/Config/llvm-config.h"
 #include "llvm/Support/CrashRecoveryContext.h"
 #include "llvm/Support/FileSystem.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/VirtualFileSystem.h"

lldb/utils/TableGen/LLDBTableGen.cpp

@@ -12,7 +12,6 @@
 
 #include "LLDBTableGenBackends.h" // Declares all backends.
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/TableGen/Error.h"

llvm/include/llvm/Support/CommandLine.h

@@ -28,6 +28,7 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/StringSaver.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cassert>
@@ -236,6 +237,12 @@ class SubCommand {
   Option *ConsumeAfterOpt = nullptr; // The ConsumeAfter option if it exists.
 };
 
+// A special subcommand representing no subcommand
+extern ManagedStatic<SubCommand> TopLevelSubCommand;
+
+// A special subcommand that can be used to put an option into all subcommands.
+extern ManagedStatic<SubCommand> AllSubCommands;
+
 class SubCommandGroup {
   SmallVector<SubCommand *, 4> Subs;
 

llvm/lib/Support/CommandLine.cpp

@@ -455,10 +455,10 @@ void OptionCategory::registerCategory() {
 // initialization because it is referenced from cl::opt constructors, which run
 // dynamically in an arbitrary order.
 LLVM_REQUIRE_CONSTANT_INITIALIZATION
-static ManagedStatic<SubCommand> TopLevelSubCommand;
+ManagedStatic<SubCommand> llvm::cl::TopLevelSubCommand;
 
 // A special subcommand that can be used to put an option into all subcommands.
-static ManagedStatic<SubCommand> AllSubCommands;
+ManagedStatic<SubCommand> llvm::cl::AllSubCommands;
 
 SubCommand &SubCommand::getTopLevel() { return *TopLevelSubCommand; }
 

llvm/lib/Support/RandomNumberGenerator.cpp

@@ -19,7 +19,6 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Error.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/raw_ostream.h"
 #ifdef _WIN32
 #include "llvm/Support/Windows/WindowsSupport.h"

llvm/lib/Support/TypeSize.cpp

@@ -8,7 +8,6 @@
 
 #include "llvm/Support/TypeSize.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/WithColor.h"
 
 #include "DebugOptions.h"

revert_patches.txt

@@ -82,4 +82,8 @@ contact: Ron and Jay
 Reverts: break componsableKernels
 9a88aa0e2b6d [Clang][Sema] Diagnose variable template explicit specializati
 contact: RonL
+
+---
+Reverts: breaks build of kfdtest
+Revert "[CommandLine] Avoid ManagedStatic.h include (NFC)"
 ---