move to PyGlobals

Author: PragmaTwice

mlir/lib/Bindings/Python/Globals.h

@@ -151,6 +151,25 @@ class PyGlobals {
 
   TracebackLoc &getTracebackLoc() { return tracebackLoc; }
 
+  class TypeIDAllocator {
+  public:
+    TypeIDAllocator() : allocator(mlirTypeIDAllocatorCreate()) {}
+    ~TypeIDAllocator() {
+      if (!allocator.ptr)
+        mlirTypeIDAllocatorDestroy(allocator);
+    }
+
+    MlirTypeIDAllocator get() { return allocator; }
+    MlirTypeID allocate() {
+      return mlirTypeIDAllocatorAllocateTypeID(allocator);
+    }
+
+  private:
+    MlirTypeIDAllocator allocator;
+  };
+
+  MlirTypeID allocateTypeID() { return typeIDAllocator.allocate(); }
+
 private:
   static PyGlobals *instance;
 
@@ -173,6 +192,7 @@ class PyGlobals {
   llvm::StringSet<> loadedDialectModules;
 
   TracebackLoc tracebackLoc;
+  TypeIDAllocator typeIDAllocator;
 };
 
 } // namespace python

mlir/lib/Bindings/Python/Pass.cpp

@@ -8,6 +8,7 @@
 
 #include "Pass.h"
 
+#include "Globals.h"
 #include "IRModule.h"
 #include "mlir-c/Pass.h"
 // clang-format off
@@ -52,23 +53,6 @@ class PyPassManager {
   MlirPassManager passManager;
 };
 
-class PyTypeIDAllocator {
-public:
-  PyTypeIDAllocator() : allocator(mlirTypeIDAllocatorCreate()) {}
-  ~PyTypeIDAllocator() {
-    if (!allocator.ptr)
-      mlirTypeIDAllocatorDestroy(allocator);
-  }
-
-  MlirTypeIDAllocator get() { return allocator; }
-  MlirTypeID allocate() { return mlirTypeIDAllocatorAllocateTypeID(allocator); }
-
-private:
-  MlirTypeIDAllocator allocator;
-};
-
-PyTypeIDAllocator globalTypeIDAllocator;
-
 } // namespace
 
 /// Create the `mlir.passmanager` here.
@@ -198,7 +182,7 @@ void mlir::python::populatePassManagerSubmodule(nb::module_ &m) {
               name = nb::cast<std::string>(
                   nb::borrow<nb::str>(run.attr("__name__")));
             }
-            MlirTypeID passID = globalTypeIDAllocator.allocate();
+            MlirTypeID passID = PyGlobals::get().allocateTypeID();
             MlirExternalPassCallbacks callbacks;
             callbacks.construct = [](void *obj) {
               (void)nb::handle(static_cast<PyObject *>(obj)).inc_ref();