Commit2108530

committed

added debug message to the assert that fails on Mac to figure out the cause

1 parentd877337 commit2108530Copy full SHA for 2108530

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -387,13 +387,13 @@ static int ClearImpl(IntPtr ob, ManagedType self)`
`387`	`387`	`boolisTypeObject=Runtime.PyObject_TYPE(ob)==Runtime.PyCLRMetaType;`
`388`	`388`	`if(!isTypeObject)`
`389`	`389`	`{`
	`390`	`+ClearObjectDict(ob);`
	`391`	`+`
`390`	`392`	`intbaseClearResult=BaseUnmanagedClear(ob);`
`391`	`393`	`if(baseClearResult!=0)`
`392`	`394`	`{`
`393`	`395`	`returnbaseClearResult;`
`394`	`396`	`}`
`395`		`-`
`396`		`-ClearObjectDict(ob);`
`397`	`397`	`}`
`398`	`398`	`if(selfis notnull)self.tpHandle=IntPtr.Zero;`
`399`	`399`	`return0;`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,13 @@ internal ClassDerivedObject(Type tp) : base(tp)`
`76`	`76`	`// So we don't call PyObject_GC_Del here and instead we set the python`
`77`	`77`	`// reference to a weak reference so that the C# object can be collected.`
`78`	`78`	`GCHandlegc=GCHandle.Alloc(self,GCHandleType.Weak);`
`79`		`-Debug.Assert(self.TypeReference==Runtime.PyObject_TYPE(self.ObjectReference));`
	`79`	`+#ifDEBUG`
	`80`	`+BorrowedReferenceinstanceType=Runtime.PyObject_TYPE(self.ObjectReference);`
	`81`	`+if(self.TypeReference!=instanceType)`
	`82`	`+{`
	`83`	`+Debug.Fail($"{newPyObject(self.TypeReference)} vs{newPyObject(instanceType)}");`
	`84`	`+}`
	`85`	`+#endif`
`80`	`86`	`SetGCHandle(self.ObjectReference,self.TypeReference,gc);`
`81`	`87`	`self.gcHandle.Free();`
`82`	`88`	`self.gcHandle=gc;`

Comments

(0)