Commitaf52ee5

committed

improved handling of dict offset in object instances

1 parente5bce06 commitaf52ee5Copy full SHA for af52ee5

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,8 @@ public static int magic(IntPtr type)`
`185`	`185`
`186`	`186`	`publicstaticintTypeDictOffset(IntPtrtype)`
`187`	`187`	`{`
`188`		`-returnManagedDataOffsets.DictOffset(type);`
	`188`	`+Debug.Assert(TypeOffset.tp_dictoffset>0);`
	`189`	`+returnMarshal.ReadInt32(type,TypeOffset.tp_dictoffset);`
`189`	`190`	`}`
`190`	`191`
`191`	`192`	`publicstaticintSize(IntPtrpyType)`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,13 +260,17 @@ protected static void ClearObjectDict(IntPtr ob)`
`260`	`260`	`protectedstaticIntPtrGetObjectDict(IntPtrob)`
`261`	`261`	`{`
`262`	`262`	`IntPtrtype=Runtime.PyObject_TYPE(ob);`
`263`		`-returnMarshal.ReadIntPtr(ob,ObjectOffset.TypeDictOffset(type));`
	`263`	`+intdictOffset=ObjectOffset.TypeDictOffset(type);`
	`264`	`+if(dictOffset==0)returnIntPtr.Zero;`
	`265`	`+returnMarshal.ReadIntPtr(ob,dictOffset);`
`264`	`266`	`}`
`265`	`267`
`266`	`268`	`protectedstaticvoidSetObjectDict(IntPtrob,IntPtrvalue)`
`267`	`269`	`{`
`268`	`270`	`IntPtrtype=Runtime.PyObject_TYPE(ob);`
`269`		`-Marshal.WriteIntPtr(ob,ObjectOffset.TypeDictOffset(type),value);`
	`271`	`+intdictOffset=ObjectOffset.TypeDictOffset(type);`
	`272`	`+Debug.Assert(dictOffset>0);`
	`273`	`+Marshal.WriteIntPtr(ob,dictOffset,value);`
`270`	`274`	`}`
`271`	`275`	`}`
`272`	`276`	`}`

Comments

(0)