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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@137406 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/diagtool/DiagTool.cpp b/tools/diagtool/DiagTool.cpp
index 1e3f4ef..36e72a2 100644
--- a/tools/diagtool/DiagTool.cpp
+++ b/tools/diagtool/DiagTool.cpp
@@ -64,5 +64,5 @@
}
namespace diagtool {
- DiagTools diagTools;
+ llvm::ManagedStatic<DiagTools> diagTools;
}
diff --git a/tools/diagtool/DiagTool.h b/tools/diagtool/DiagTool.h
index 5e5e11f..dcb6ac7 100644
--- a/tools/diagtool/DiagTool.h
+++ b/tools/diagtool/DiagTool.h
@@ -16,6 +16,7 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/ManagedStatic.h"
#include <string>
@@ -45,12 +46,12 @@
void printCommands(llvm::raw_ostream &out);
};
-extern DiagTools diagTools;
-
+extern llvm::ManagedStatic<DiagTools> diagTools;
+
template <typename DIAGTOOL>
class RegisterDiagTool {
public:
- RegisterDiagTool() { diagTools.registerTool(new DIAGTOOL()); }
+ RegisterDiagTool() { diagTools->registerTool(new DIAGTOOL()); }
};
} // end diagtool namespace
diff --git a/tools/diagtool/ListWarnings.cpp b/tools/diagtool/ListWarnings.cpp
index 70be1c4..e286f8d 100644
--- a/tools/diagtool/ListWarnings.cpp
+++ b/tools/diagtool/ListWarnings.cpp
@@ -50,7 +50,7 @@
llvm::IntrusiveRefCntPtr<DiagnosticIDs> Diags(new DiagnosticIDs);
Diagnostic D(Diags);
- std::vector<Entry> Flagged, Unflagged;;
+ std::vector<Entry> Flagged, Unflagged;
llvm::StringMap<std::vector<unsigned> > flagHistogram;
for (DiagnosticIDs::diag_iterator di = DiagnosticIDs::diags_begin(),
diff --git a/tools/diagtool/diagtool_main.cpp b/tools/diagtool/diagtool_main.cpp
index 66a73e9..e34f0dc 100644
--- a/tools/diagtool/diagtool_main.cpp
+++ b/tools/diagtool/diagtool_main.cpp
@@ -17,10 +17,10 @@
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;
}