The diagtool registration system tries to use a global variable from a method

called on another global variable. Use ManagedStatic to ensure that the global
we register with actually exists when we need it.

llvm-svn: 137406

1 files changed, 2 insertions, 2 deletions

diff --git a/clang/tools/diagtool/diagtool_main.cpp b/clang/tools/diagtool/diagtool_main.cpp
index 66a73e947a1..e34f0dc06c6 100644
--- a/clang/tools/diagtool/diagtool_main.cpp
+++ b/clang/tools/diagtool/diagtool_main.cpp
@@ -17,10 +17,10 @@ using namespace diagtool;
 
 int main(int argc, char *argv[]) {
   if (argc > 1)
-    if (DiagTool *tool = diagTools.getTool(argv[1]))
+    if (DiagTool *tool = diagTools->getTool(argv[1]))
       return tool->run(argc - 1, &argv[2], llvm::errs());
 
   llvm::errs() << "usage: diagtool <command> [<args>]\n\n";
-  diagTools.printCommands(llvm::errs());
+  diagTools->printCommands(llvm::errs());
   return 1;    
 }