Guards for the compiler driver plugin list.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74230 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CompilerDriver/Plugin.cpp b/lib/CompilerDriver/Plugin.cpp
index 75abbd0..cb3c7be 100644
--- a/lib/CompilerDriver/Plugin.cpp
+++ b/lib/CompilerDriver/Plugin.cpp
@@ -12,7 +12,8 @@
//===----------------------------------------------------------------------===//
#include "llvm/CompilerDriver/Plugin.h"
-
+#include "llvm/Support/ManagedStatic.h"
+#include "llvm/System/Mutex.h"
#include <algorithm>
#include <vector>
@@ -28,6 +29,7 @@
static bool pluginListInitialized = false;
typedef std::vector<const llvmc::BasePlugin*> PluginList;
static PluginList Plugins;
+ static llvm::ManagedStatic<llvm::sys::SmartMutex<true> > PluginMutex;
struct ByPriority {
bool operator()(const llvmc::BasePlugin* lhs,
@@ -40,6 +42,7 @@
namespace llvmc {
PluginLoader::PluginLoader() {
+ llvm::sys::SmartScopedLock<true> Lock(&*PluginMutex);
if (!pluginListInitialized) {
for (PluginRegistry::iterator B = PluginRegistry::begin(),
E = PluginRegistry::end(); B != E; ++B)
@@ -50,6 +53,7 @@
}
PluginLoader::~PluginLoader() {
+ llvm::sys::SmartScopedLock<true> Lock(&*PluginMutex);
if (pluginListInitialized) {
for (PluginList::iterator B = Plugins.begin(), E = Plugins.end();
B != E; ++B)
@@ -59,12 +63,14 @@
}
void PluginLoader::PopulateLanguageMap(LanguageMap& langMap) {
+ llvm::sys::SmartScopedLock<true> Lock(&*PluginMutex);
for (PluginList::iterator B = Plugins.begin(), E = Plugins.end();
B != E; ++B)
(*B)->PopulateLanguageMap(langMap);
}
void PluginLoader::PopulateCompilationGraph(CompilationGraph& graph) {
+ llvm::sys::SmartScopedLock<true> Lock(&*PluginMutex);
for (PluginList::iterator B = Plugins.begin(), E = Plugins.end();
B != E; ++B)
(*B)->PopulateCompilationGraph(graph);