try fix windows badcast

Author: makslevental

mlir/include/mlir/Bindings/Python/Globals.h

@@ -38,10 +38,7 @@ class PyGlobals {
   ~PyGlobals();
 
   /// Most code should get the globals via this static accessor.
-  static PyGlobals &get() {
-    assert(instance && "PyGlobals is null");
-    return *instance;
-  }
+  static PyGlobals &get();
 
   /// Get and set the list of parent modules to search for dialect
   /// implementation classes.

mlir/lib/Bindings/Python/Globals.cpp

@@ -39,6 +39,11 @@ PyGlobals::PyGlobals() {
 
 PyGlobals::~PyGlobals() { instance = nullptr; }
 
+PyGlobals &PyGlobals::get() {
+  assert(instance && "PyGlobals is null");
+  return *instance;
+}
+
 bool PyGlobals::loadDialectModule(llvm::StringRef dialectNamespace) {
   {
     nb::ft_lock_guard lock(mutex);

mlir/python/CMakeLists.txt

@@ -994,17 +994,16 @@ endif()
 get_property(NB_LIBRARY_TARGET_NAME TARGET MLIRPythonModules.extension._mlir.dso PROPERTY LINK_LIBRARIES)
 list(GET NB_LIBRARY_TARGET_NAME 0 NB_LIBRARY_TARGET_NAME)
 add_mlir_library_install(${NB_LIBRARY_TARGET_NAME})
-add_mlir_library(MLIRPythonSupport
+add_library(MLIRPythonSupport SHARED
   ${PYTHON_SOURCE_DIR}/IRCore.cpp
   ${PYTHON_SOURCE_DIR}/Globals.cpp
-  EXCLUDE_FROM_LIBMLIR
-  SHARED
-  LINK_COMPONENTS
-    Support
-  LINK_LIBS
-    Python::Module
-    ${NB_LIBRARY_TARGET_NAME}
-    MLIRPythonCAPI
+)
+target_link_libraries(MLIRPythonSupport PRIVATE
+  LLVMSupport
+  Python::Module
+  ${NB_LIBRARY_TARGET_NAME}
+  MLIRPythonCAPI
+
 )
 if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND (NOT LLVM_USE_SANITIZER))
   target_link_options(MLIRPythonSupport PRIVATE "-Wl,-z,undefs")
@@ -1028,6 +1027,7 @@ set_target_properties(${NB_LIBRARY_TARGET_NAME} PROPERTIES
 set(eh_rtti_enable)
 if(MSVC)
   set(eh_rtti_enable /EHsc /GR)
+  set_property(TARGET MLIRPythonSupport PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
 elseif(LLVM_COMPILER_IS_GCC_COMPATIBLE OR CLANG_CL)
   set(eh_rtti_enable -frtti -fexceptions)
 endif()

mlir/test/python/dialects/python_test.py

@@ -613,12 +613,6 @@ def testCustomType():
         b = TestType(a)
         # Instance custom types should have typeids
         assert isinstance(b.typeid, TypeID)
-        # Subclasses of ir.Type should not have a static_typeid
-        # CHECK: 'TestType' object has no attribute 'static_typeid'
-        try:
-            b.static_typeid
-        except AttributeError as e:
-            print(e)
 
         i8 = IntegerType.get_signless(8)
         try:
@@ -633,9 +627,9 @@ def testCustomType():
         try:
             TestType(42)
         except TypeError as e:
-            assert "Expected an MLIR object (got 42)" in str(e)
-        except ValueError as e:
-            assert "Cannot cast type to TestType (from 42)" in str(e)
+            assert "__init__(): incompatible function arguments. The following argument types are supported" in str(e)
+            assert "__init__(self, cast_from_type: mlir._mlir_libs._mlir.ir.Type) -> None" in str(e)
+            assert "Invoked with types: mlir._mlir_libs._mlirPythonTestNanobind.TestType, int" in str(e)
         else:
             raise