[llvm] 2fe3589 - ManagedStatic: remove from PluginLoader

[Nicolai Hähnle via llvm-commits]

Author: Nicolai Hähnle
Date: 2022-08-03T10:41:58+02:00
New Revision: 2fe3589acdbb87a6beb6173bb9b56d1bdab95d6a

URL: https://github.com/llvm/llvm-project/commit/2fe3589acdbb87a6beb6173bb9b56d1bdab95d6a
DIFF: https://github.com/llvm/llvm-project/commit/2fe3589acdbb87a6beb6173bb9b56d1bdab95d6a.diff

LOG: ManagedStatic: remove from PluginLoader

Differential Revision: https://reviews.llvm.org/D129123

Added: 
    

Modified: 
    llvm/lib/Support/PluginLoader.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Support/PluginLoader.cpp b/llvm/lib/Support/PluginLoader.cpp
index 6fe195ffda7a..cbe413ce2556 100644
--- a/llvm/lib/Support/PluginLoader.cpp
+++ b/llvm/lib/Support/PluginLoader.cpp
@@ -13,34 +13,46 @@
 #define DONT_GET_PLUGIN_LOADER_OPTION
 #include "llvm/Support/PluginLoader.h"
 #include "llvm/Support/DynamicLibrary.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Mutex.h"
 #include "llvm/Support/raw_ostream.h"
 #include <vector>
 using namespace llvm;
 
-static ManagedStatic<std::vector<std::string> > Plugins;
-static ManagedStatic<sys::SmartMutex<true> > PluginsLock;
+namespace {
+
+struct Plugins {
+  sys::SmartMutex<true> Lock;
+  std::vector<std::string> List;
+};
+
+Plugins &getPlugins() {
+  static Plugins P;
+  return P;
+}
+
+} // anonymous namespace
 
 void PluginLoader::operator=(const std::string &Filename) {
-  sys::SmartScopedLock<true> Lock(*PluginsLock);
+  auto &P = getPlugins();
+  sys::SmartScopedLock<true> Lock(P.Lock);
   std::string Error;
   if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
     errs() << "Error opening '" << Filename << "': " << Error
            << "\n  -load request ignored.\n";
   } else {
-    Plugins->push_back(Filename);
+    P.List.push_back(Filename);
   }
 }
 
 unsigned PluginLoader::getNumPlugins() {
-  sys::SmartScopedLock<true> Lock(*PluginsLock);
-  return Plugins.isConstructed() ? Plugins->size() : 0;
+  auto &P = getPlugins();
+  sys::SmartScopedLock<true> Lock(P.Lock);
+  return P.List.size();
 }
 
 std::string &PluginLoader::getPlugin(unsigned num) {
-  sys::SmartScopedLock<true> Lock(*PluginsLock);
-  assert(Plugins.isConstructed() && num < Plugins->size() &&
-         "Asking for an out of bounds plugin");
-  return (*Plugins)[num];
+  auto &P = getPlugins();
+  sys::SmartScopedLock<true> Lock(P.Lock);
+  assert(num < P.List.size() && "Asking for an out of bounds plugin");
+  return P.List[num];
 }