Commitbc137bb

committed

added a workaround for tp_clear implementations, that do not check, that they are not the first in tp_clear's MRO

1 parent6b20409 commitbc137bbCopy full SHA for bc137bb

File tree

+31

-12

lines changed

+31

-12

lines changed

Lines changed: 22 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -360,21 +360,33 @@ public static void tp_dealloc(IntPtr ob)`
`360`	`360`
`361`	`361`	`publicstaticinttp_clear(IntPtrob)`
`362`	`362`	`{`
`363`		`-ManagedTypeself=GetManagedObject(ob);`
	`363`	`+varself=(CLRObject)GetManagedObject(ob);`
`364`	`364`
`365`		`-boolisTypeObject=Runtime.PyObject_TYPE(ob)==Runtime.PyCLRMetaType;`
`366`		`-if(!isTypeObject)`
`367`		`-{`
`368`		`-ClearObjectDict(ob);`
	`365`	`+if(self.clearReentryGuard)return0;`
`369`	`366`
`370`		`-intbaseClearResult=BaseUnmanagedClear(ob);`
`371`		`-if(baseClearResult!=0)`
	`367`	`+// workaround for https://bugs.python.org/issue45266`
	`368`	`+self.clearReentryGuard=true;`
	`369`	`+`
	`370`	`+try`
	`371`	`+{`
	`372`	`+boolisTypeObject=Runtime.PyObject_TYPE(ob)==Runtime.PyCLRMetaType;`
	`373`	`+if(!isTypeObject)`
`372`	`374`	`{`
`373`		`-returnbaseClearResult;`
	`375`	`+intbaseClearResult=BaseUnmanagedClear(ob);`
	`376`	`+if(baseClearResult!=0)`
	`377`	`+{`
	`378`	`+returnbaseClearResult;`
	`379`	`+}`
	`380`	`+`
	`381`	`+ClearObjectDict(ob);`
`374`	`382`	`}`
	`383`	`+if(selfis notnull)self.tpHandle=IntPtr.Zero;`
	`384`	`+return0;`
	`385`	`+}`
	`386`	`+finally`
	`387`	`+{`
	`388`	`+self.clearReentryGuard=false;`
`375`	`389`	`}`
`376`		`-if(selfis notnull)self.tpHandle=IntPtr.Zero;`
`377`		`-return0;`
`378`	`390`	`}`
`379`	`391`
`380`	`392`	`staticunsafeintBaseUnmanagedClear(IntPtrob)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,11 @@ namespace Python.Runtime`
`9`	`9`	`internalclassCLRObject:ManagedType`
`10`	`10`	`{`
`11`	`11`	`internalobjectinst;`
	`12`	`+internalboolclearReentryGuard;`
`12`	`13`
`13`	`14`	`internalCLRObject(objectob,IntPtrtp)`
`14`	`15`	`{`
`15`		`-System.Diagnostics.Debug.Assert(tp!=IntPtr.Zero);`
	`16`	`+Debug.Assert(tp!=IntPtr.Zero);`
`16`	`17`	`IntPtrpy=Runtime.PyType_GenericAlloc(tp,0);`
`17`	`18`
`18`	`19`	`tpHandle=tp;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ internal static bool IsInstanceOfManagedType(IntPtr ob)`
`145`	`145`
`146`	`146`	`internalstaticboolIsManagedType(BorrowedReferencetype)`
`147`	`147`	`{`
`148`		`-varflags=(TypeFlags)Util.ReadCLong(type.DangerousGetAddress(),TypeOffset.tp_flags);`
	`148`	`+varflags=PyType.GetFlags(type);`
`149`	`149`	`return(flags&TypeFlags.HasClrInstance)!=0;`
`150`	`150`	`}`
`151`	`151`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,12 @@ internal IntPtr GetSlot(TypeSlotID slot)`
`103`	`103`	`returnExceptions.ErrorCheckIfNull(result);`
`104`	`104`	`}`
`105`	`105`
	`106`	`+internalstaticTypeFlagsGetFlags(BorrowedReferencetype)`
	`107`	`+{`
	`108`	`+Debug.Assert(TypeOffset.tp_flags>0);`
	`109`	`+return(TypeFlags)Util.ReadCLong(type.DangerousGetAddress(),TypeOffset.tp_flags);`
	`110`	`+}`
	`111`	`+`
`106`	`112`	`internalstaticBorrowedReferenceGetBase(BorrowedReferencetype)`
`107`	`113`	`{`
`108`	`114`	`Debug.Assert(IsType(type));`

Comments

(0)