Set ht_token to NULL in Python 3.14

filmor · filmor · commit 2533df1d527f · 2025-10-26T18:31:52.000+01:00
diff --git a/src/runtime/Native/TypeOffset.cs b/src/runtime/Native/TypeOffset.cs
@@ -77,6 +77,8 @@ static partial class TypeOffset
         internal static int tp_setattro { get; private set; }
         internal static int tp_str { get; private set; }
         internal static int tp_traverse { get; private set; }
+        // Special case: Only available in Python 3.14 onwards, set to -1 by default
+        internal static int ht_token { get; private set; } = -1;
 
         internal static void Use(ITypeOffsets offsets, int extraHeadOffset)
         {
@@ -89,6 +91,19 @@ internal static void Use(ITypeOffsets offsets, int extraHeadOffset)
                 slotNames.Add(offsetProperty.Name);
 
                 var sourceProperty = typeof(ITypeOffsets).GetProperty(offsetProperty.Name);
+                if (sourceProperty == null)
+                {
+                    if ((int)offsetProperty.GetValue(null) == -1)
+                    {
+                        // Skip, this is an optional offset value
+                        continue;
+                    }
+                    else
+                    {
+                        throw new Exception($"No offset defined for necessary slot {offsetProperty.Name}");
+                    }
+                }
+
                 int value = (int)sourceProperty.GetValue(offsets, null);
                 value += extraHeadOffset;
                 offsetProperty.SetValue(obj: null, value: value, index: null);
diff --git a/src/runtime/TypeManager.cs b/src/runtime/TypeManager.cs
@@ -618,6 +618,11 @@ internal static PyType AllocateTypeObject(string name, PyType metatype)
             Util.WriteIntPtr(type, TypeOffset.tp_traverse, subtype_traverse);
             Util.WriteIntPtr(type, TypeOffset.tp_clear, subtype_clear);
 
+            // This is a new mechanism in Python 3.14. We should eventually use it to implement
+            // a nicer type check, but for now we just need to ensure that it is set to NULL.
+            if (TypeOffset.ht_token != -1)
+                Util.WriteIntPtr(type, TypeOffset.ht_token, IntPtr.Zero);
+
             InheritSubstructs(type.Reference.DangerousGetAddress());
 
             return type;
