Code review fixes

BadSingleton · BadSingleton · commit 5ea9c3ca63ec · 2021-03-04T10:50:12.000-05:00
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -106,7 +106,7 @@ protected override void OnLoad(InterDomainContext context)
 
         public override string ToString()
         {
-            return $"<CLRObject wrapping {inst}>";
+            return $"<CLRObject: {inst}>";
         }
     }
 }
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -89,7 +89,8 @@ internal static Exception ToException(IntPtr ob)
         static void ClearOffsetHelper(IntPtr ob, int offset)
         {
             var field = Marshal.ReadIntPtr(ob, offset);
-            Runtime.Py_CLEAR(ref field);
+            Runtime.XDecref(field);
+            Marshal.WriteIntPtr(ob, offset, IntPtr.Zero);
         }
 
         // As seen in exceptions.c, every derived type must also clean the base.
@@ -200,19 +201,9 @@ internal static void SetArgsAndCause(IntPtr ob)
 
             if (e.InnerException != null)
             {
-                if(e.InnerException is PythonException)
-                {
-                    // If the error is a Python exception, write the real one
-                    var pyerr =  (e.InnerException as PythonException);
-                    Runtime.XIncref(pyerr.PyValue);
-                    Runtime.PyException_SetCause(ob, pyerr.PyValue);
-                }
-                else
-                {
-                    // Note: For an AggregateException, InnerException is only the first of the InnerExceptions.
-                    IntPtr cause = CLRObject.GetInstHandle(e.InnerException);
-                    Runtime.PyException_SetCause(ob, cause);
-                }
+                // Note: For an AggregateException, InnerException is only the first of the InnerExceptions.
+                IntPtr cause = CLRObject.GetInstHandle(e.InnerException);
+                Runtime.PyException_SetCause(ob, cause);
             }
         }
 
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
@@ -429,7 +429,8 @@ def do_test_leak():
         orig_exc = {x for x in get_all_objects() if isinstance(x, Exception)}
         func()
         exc = {x for x in get_all_objects() if isinstance(x, Exception)}
-        assert not exc - orig_exc
+        possibly_leaked = exc - orig_exc
+        assert not possibly_leaked
     
     return do_test_leak
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ protected override void OnLoad(InterDomainContext context)`
`106`	`106`
`107`	`107`	`public override string ToString()`
`108`	`108`	`{`
`109`		`- return $"<CLRObject wrapping {inst}>";`
	`109`	`+ return $"<CLRObject: {inst}>";`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ internal static Exception ToException(IntPtr ob)`
`89`	`89`	`static void ClearOffsetHelper(IntPtr ob, int offset)`
`90`	`90`	`{`
`91`	`91`	`var field = Marshal.ReadIntPtr(ob, offset);`
`92`		`- Runtime.Py_CLEAR(ref field);`
	`92`	`+ Runtime.XDecref(field);`
	`93`	`+ Marshal.WriteIntPtr(ob, offset, IntPtr.Zero);`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`// As seen in exceptions.c, every derived type must also clean the base.`
`@@ -200,19 +201,9 @@ internal static void SetArgsAndCause(IntPtr ob)`
`200`	`201`
`201`	`202`	`if (e.InnerException != null)`
`202`	`203`	`{`
`203`		`- if(e.InnerException is PythonException)`
`204`		`- {`
`205`		`- // If the error is a Python exception, write the real one`
`206`		`- var pyerr = (e.InnerException as PythonException);`
`207`		`- Runtime.XIncref(pyerr.PyValue);`
`208`		`- Runtime.PyException_SetCause(ob, pyerr.PyValue);`
`209`		`- }`
`210`		`- else`
`211`		`- {`
`212`		`- // Note: For an AggregateException, InnerException is only the first of the InnerExceptions.`
`213`		`- IntPtr cause = CLRObject.GetInstHandle(e.InnerException);`
`214`		`- Runtime.PyException_SetCause(ob, cause);`
`215`		`- }`
	`204`	`+ // Note: For an AggregateException, InnerException is only the first of the InnerExceptions.`
	`205`	`+ IntPtr cause = CLRObject.GetInstHandle(e.InnerException);`
	`206`	`+ Runtime.PyException_SetCause(ob, cause);`
`216`	`207`	`}`
`217`	`208`	`}`
`218`	`209`