Support calling PyType_Modified on any Python class

timfel · elkorchi · commit 11936fb04188 · 2025-03-25T13:58:46.000Z
(cherry picked from commit cef2e89)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java
@@ -228,20 +228,24 @@ static Object doIt(PythonAbstractNativeObject clazz,
 
     @CApiBuiltin(ret = ArgDescriptor.Void, args = {PyTypeObject}, call = Direct)
     abstract static class PyType_Modified extends CApiUnaryBuiltinNode {
-
         @TruffleBoundary
         @Specialization
-        static Object doIt(PythonAbstractNativeObject clazz,
+        static Object doIt(PythonAbstractClass object,
                         @Bind("this") Node inliningTarget) {
-            PythonContext context = PythonContext.get(inliningTarget);
-            CyclicAssumption nativeClassStableAssumption = context.getNativeClassStableAssumption(clazz, false);
-            if (nativeClassStableAssumption != null) {
-                nativeClassStableAssumption.invalidate("PyType_Modified(\"" + TypeNodes.GetNameNode.executeUncached(clazz).toJavaStringUncached() + "\") called");
+            if (object instanceof PythonAbstractNativeObject clazz) {
+                PythonContext context = PythonContext.get(inliningTarget);
+                CyclicAssumption nativeClassStableAssumption = context.getNativeClassStableAssumption(clazz, false);
+                if (nativeClassStableAssumption != null) {
+                    nativeClassStableAssumption.invalidate("PyType_Modified(\"" + TypeNodes.GetNameNode.executeUncached(clazz).toJavaStringUncached() + "\") called");
+                }
+                MroSequenceStorage mroStorage = TypeNodes.GetMroStorageNode.executeUncached(clazz);
+                mroStorage.lookupChanged();
+                // Reload slots from native, which also invalidates cached slot lookups
+                clazz.setTpSlots(TpSlots.fromNative(clazz, context));
+            } else {
+                MroSequenceStorage mroStorage = TypeNodes.GetMroStorageNode.executeUncached(object);
+                mroStorage.lookupChanged();
             }
-            MroSequenceStorage mroStorage = TypeNodes.GetMroStorageNode.executeUncached(clazz);
-            mroStorage.lookupChanged();
-            // Reload slots from native, which also invalidates cached slot lookups
-            clazz.setTpSlots(TpSlots.fromNative(clazz, context));
             return PNone.NO_VALUE;
         }
     }
