Commit2533df1

committed

Set ht_token to NULL in Python 3.14

1 parentdfe8fff commit2533df1Copy full SHA for 2533df1

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ static partial class TypeOffset`
`77`	`77`	`internalstaticinttp_setattro{get;privateset;}`
`78`	`78`	`internalstaticinttp_str{get;privateset;}`
`79`	`79`	`internalstaticinttp_traverse{get;privateset;}`
	`80`	`+// Special case: Only available in Python 3.14 onwards, set to -1 by default`
	`81`	`+internalstaticintht_token{get;privateset;}=-1;`
`80`	`82`
`81`	`83`	`internalstaticvoidUse(ITypeOffsetsoffsets,intextraHeadOffset)`
`82`	`84`	`{`
`@@ -89,6 +91,19 @@ internal static void Use(ITypeOffsets offsets, int extraHeadOffset)`
`89`	`91`	`slotNames.Add(offsetProperty.Name);`
`90`	`92`
`91`	`93`	`varsourceProperty=typeof(ITypeOffsets).GetProperty(offsetProperty.Name);`
	`94`	`+if(sourceProperty==null)`
	`95`	`+{`
	`96`	`+if((int)offsetProperty.GetValue(null)==-1)`
	`97`	`+{`
	`98`	`+// Skip, this is an optional offset value`
	`99`	`+continue;`
	`100`	`+}`
	`101`	`+else`
	`102`	`+{`
	`103`	`+thrownewException($"No offset defined for necessary slot{offsetProperty.Name}");`
	`104`	`+}`
	`105`	`+}`
	`106`	`+`
`92`	`107`	`intvalue=(int)sourceProperty.GetValue(offsets,null);`
`93`	`108`	`value+=extraHeadOffset;`
`94`	`109`	`offsetProperty.SetValue(obj:null,value:value,index:null);`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -618,6 +618,11 @@ internal static PyType AllocateTypeObject(string name, PyType metatype)`
`618`	`618`	`Util.WriteIntPtr(type,TypeOffset.tp_traverse,subtype_traverse);`
`619`	`619`	`Util.WriteIntPtr(type,TypeOffset.tp_clear,subtype_clear);`
`620`	`620`
	`621`	`+// This is a new mechanism in Python 3.14. We should eventually use it to implement`
	`622`	`+// a nicer type check, but for now we just need to ensure that it is set to NULL.`
	`623`	`+if(TypeOffset.ht_token!=-1)`
	`624`	`+Util.WriteIntPtr(type,TypeOffset.ht_token,IntPtr.Zero);`
	`625`	`+`
`621`	`626`	`InheritSubstructs(type.Reference.DangerousGetAddress());`
`622`	`627`
`623`	`628`	`returntype;`

Comments

(0)