ManagedStatic: remove from PassManagerBuilder

[nhaehnle]

Rebase

[efriedma]

llvm/lib/Transforms/IPO/PassManagerBuilder.cpp

256

I don't think you've managed to quite capture the intended semantic here. Note the comment mentions what happens after GlobalExtensions is destroyed...

[nhaehnle]

• reset GlobalExtensionsConstructed in the destructor of GlobalExtensions

llvm/lib/Transforms/IPO/PassManagerBuilder.cpp

256

I think you're right. I must've intended to add a destructor for GlobalExtensions (why else define the struct?) but then forgot...

[efriedma]

LGTM

llvm/lib/Transforms/IPO/PassManagerBuilder.cpp

 #include "llvm/Analysis/CFLAndersAliasAnalysis.h"
 #include "llvm/Analysis/CFLSteensAliasAnalysis.h"
 #include "llvm/Analysis/GlobalsModRef.h"
 #include "llvm/Analysis/ScopedNoAliasAA.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Analysis/TypeBasedAliasAnalysis.h"
 #include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Target/CGPassBuilderOption.h"
 #include "llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/IPO/Attributor.h"
 #include "llvm/Transforms/IPO/ForceFunctionAttrs.h"
 #include "llvm/Transforms/IPO/FunctionAttrs.h"
 #include "llvm/Transforms/IPO/InferFunctionAttrs.h"
 #include "llvm/Transforms/InstCombine/InstCombine.h"
PassManagerBuilder::PassManagerBuilder() {
     CallGraphProfile = true;
 }
 
 PassManagerBuilder::~PassManagerBuilder() {
   delete LibraryInfo;
   delete Inliner;
 }
 
-/// Set of global extensions, automatically added as part of the standard set.
-static ManagedStatic<
+namespace {
+
+bool GlobalExtensionsConstructed = false;
+PassManagerBuilder::GlobalExtensionID GlobalExtensionsCounter;
+
+using GlobalExtensionsVector =
     SmallVector<std::tuple<PassManagerBuilder::ExtensionPointTy,
                            PassManagerBuilder::ExtensionFn,
-                           PassManagerBuilder::GlobalExtensionID>,
-                8>>
-    GlobalExtensions;
-static PassManagerBuilder::GlobalExtensionID GlobalExtensionsCounter;
+                           PassManagerBuilder::GlobalExtensionID>>;
+
+struct GlobalExtensions {
+  GlobalExtensionsVector Extensions;
+
+  GlobalExtensions() { GlobalExtensionsConstructed = true; }
+};
+
+/// Set of global extensions, automatically added as part of the standard set.
+GlobalExtensionsVector &getGlobalExtensions() {
+  static GlobalExtensions GlobalExts;
+  return GlobalExts.Extensions;
+}
+
+} // anonymous namespace
 
 /// Check if GlobalExtensions is constructed and not empty.
 /// Since GlobalExtensions is a managed static, calling 'empty()' will trigger
 /// the construction of the object.
 static bool GlobalExtensionsNotEmpty() {
-  return GlobalExtensions.isConstructed() && !GlobalExtensions->empty();
+  return GlobalExtensionsConstructed && !getGlobalExtensions().empty();
 }
 
 PassManagerBuilder::GlobalExtensionID
 PassManagerBuilder::addGlobalExtension(PassManagerBuilder::ExtensionPointTy Ty,
                                        PassManagerBuilder::ExtensionFn Fn) {
   auto ExtensionID = GlobalExtensionsCounter++;
-  GlobalExtensions->push_back(std::make_tuple(Ty, std::move(Fn), ExtensionID));
+  getGlobalExtensions().push_back(
+      std::make_tuple(Ty, std::move(Fn), ExtensionID));
   return ExtensionID;
 }
 
 void PassManagerBuilder::removeGlobalExtension(
     PassManagerBuilder::GlobalExtensionID ExtensionID) {
   // RegisterStandardPasses may try to call this function after GlobalExtensions
   // has already been destroyed; doing so should not generate an error.
-  if (!GlobalExtensions.isConstructed())
+  if (!GlobalExtensionsConstructed)
     return;
 
   auto GlobalExtension =
-      llvm::find_if(*GlobalExtensions, [ExtensionID](const auto &elem) {
+      llvm::find_if(getGlobalExtensions(), [ExtensionID](const auto &elem) {
         return std::get<2>(elem) == ExtensionID;
       });
-  assert(GlobalExtension != GlobalExtensions->end() &&
+  assert(GlobalExtension != getGlobalExtensions().end() &&
          "The extension ID to be removed should always be valid.");
 
-  GlobalExtensions->erase(GlobalExtension);
+  getGlobalExtensions().erase(GlobalExtension);
 }
 
 void PassManagerBuilder::addExtension(ExtensionPointTy Ty, ExtensionFn Fn) {
   Extensions.push_back(std::make_pair(Ty, std::move(Fn)));
 }
 
 void PassManagerBuilder::addExtensionsToPM(ExtensionPointTy ETy,
                                            legacy::PassManagerBase &PM) const {
   if (GlobalExtensionsNotEmpty()) {
-    for (auto &Ext : *GlobalExtensions) {
+    for (auto &Ext : getGlobalExtensions()) {
       if (std::get<0>(Ext) == ETy)
         std::get<1>(Ext)(*this, PM);
     }
   }
   for (unsigned i = 0, e = Extensions.size(); i != e; ++i)
     if (Extensions[i].first == ETy)
       Extensions[i].second(*this, PM);
 }