pythonnet
diff --git a/‎src/runtime/clrobject.cs
Lines changed: 4 additions & 1 deletion b/‎src/runtime/clrobject.cs
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/runtime/exceptions.cs
Lines changed: 8 additions & 17 deletions b/‎src/runtime/exceptions.cs
Lines changed: 8 additions & 17 deletions
@@ -33,7 +33,7 @@ internal CLRObject(object ob, IntPtr tp)
 
             // Fix the BaseException args (and __cause__ in case of Python 3)
             // slot if wrapping a CLR exception
-            Exceptions.SetArgsAndCause(py);
+            Exceptions.SetArgsAndCause(ObjectReference);
         }
 
         protected CLRObject()
@@ -78,6 +78,9 @@ internal static IntPtr GetInstHandle(object ob)
             return co.pyHandle;
         }
 
+        internal static NewReference GetReference(object ob)
+            => NewReference.DangerousFromPointer(GetInstHandle(ob));
+
         internal static CLRObject Restore(object ob, IntPtr pyHandle, InterDomainContext context)
         {
             CLRObject co = new CLRObject()
 
@@ -24,27 +24,18 @@ internal ExceptionClassObject(Type tp) : base(tp)
         {
         }
 
-        internal static Exception ToException(IntPtr ob)
+        internal static Exception ToException(BorrowedReference ob)
         {
             var co = GetManagedObject(ob) as CLRObject;
-            if (co == null)
-            {
-                return null;
-            }
-            var e = co.inst as Exception;
-            if (e == null)
-            {
-                return null;
-            }
-            return e;
+            return co?.inst as Exception;
         }
 
         /// <summary>
         /// Exception __repr__ implementation
         /// </summary>
         public new static IntPtr tp_repr(IntPtr ob)
         {
-            Exception e = ToException(ob);
+            Exception e = ToException(new BorrowedReference(ob));
             if (e == null)
             {
                 return Exceptions.RaiseTypeError("invalid object");
@@ -67,7 +58,7 @@ internal static Exception ToException(IntPtr ob)
         /// </summary>
         public new static IntPtr tp_str(IntPtr ob)
         {
-            Exception e = ToException(ob);
+            Exception e = ToException(new BorrowedReference(ob));
             if (e == null)
             {
                 return Exceptions.RaiseTypeError("invalid object");
@@ -157,7 +148,7 @@ internal static void Shutdown()
         /// pointer.
         /// </summary>
         /// <param name="ob">The python object wrapping </param>
-        internal static void SetArgsAndCause(IntPtr ob)
+        internal static void SetArgsAndCause(BorrowedReference ob)
         {
             // e: A CLR Exception
             Exception e = ExceptionClassObject.ToException(ob);
@@ -178,13 +169,13 @@ internal static void SetArgsAndCause(IntPtr ob)
                 args = Runtime.PyTuple_New(0);
             }
 
-            Marshal.WriteIntPtr(ob, ExceptionOffset.args, args);
+            Marshal.WriteIntPtr(ob.DangerousGetAddress(), ExceptionOffset.args, args);
 
             if (e.InnerException != null)
             {
                 // Note: For an AggregateException, InnerException is only the first of the InnerExceptions.
-                IntPtr cause = CLRObject.GetInstHandle(e.InnerException);
-                Marshal.WriteIntPtr(ob, ExceptionOffset.cause, cause);
+                using var cause = CLRObject.GetReference(e.InnerException);
+                Runtime.PyException_SetCause(ob, cause.Steal());
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ internal CLRObject(object ob, IntPtr tp)`
`33`	`33`
`34`	`34`	`// Fix the BaseException args (and __cause__ in case of Python 3)`
`35`	`35`	`// slot if wrapping a CLR exception`
`36`		`- Exceptions.SetArgsAndCause(py);`
	`36`	`+ Exceptions.SetArgsAndCause(ObjectReference);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`protected CLRObject()`
`@@ -78,6 +78,9 @@ internal static IntPtr GetInstHandle(object ob)`
`78`	`78`	`return co.pyHandle;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+ internal static NewReference GetReference(object ob)`
	`82`	`+ => NewReference.DangerousFromPointer(GetInstHandle(ob));`
	`83`	`+`
`81`	`84`	`internal static CLRObject Restore(object ob, IntPtr pyHandle, InterDomainContext context)`
`82`	`85`	`{`
`83`	`86`	`CLRObject co = new CLRObject()`
Original file line number	Diff line number	Diff line change
`@@ -24,27 +24,18 @@ internal ExceptionClassObject(Type tp) : base(tp)`
`24`	`24`	`{`
`25`	`25`	`}`
`26`	`26`
`27`		`- internal static Exception ToException(IntPtr ob)`
	`27`	`+ internal static Exception ToException(BorrowedReference ob)`
`28`	`28`	`{`
`29`	`29`	`var co = GetManagedObject(ob) as CLRObject;`
`30`		`- if (co == null)`
`31`		`- {`
`32`		`- return null;`
`33`		`- }`
`34`		`- var e = co.inst as Exception;`
`35`		`- if (e == null)`
`36`		`- {`
`37`		`- return null;`
`38`		`- }`
`39`		`- return e;`
	`30`	`+ return co?.inst as Exception;`
`40`	`31`	`}`
`41`	`32`
`42`	`33`	`/// <summary>`
`43`	`34`	`/// Exception __repr__ implementation`
`44`	`35`	`/// </summary>`
`45`	`36`	`public new static IntPtr tp_repr(IntPtr ob)`
`46`	`37`	`{`
`47`		`- Exception e = ToException(ob);`
	`38`	`+ Exception e = ToException(new BorrowedReference(ob));`
`48`	`39`	`if (e == null)`
`49`	`40`	`{`
`50`	`41`	`return Exceptions.RaiseTypeError("invalid object");`
`@@ -67,7 +58,7 @@ internal static Exception ToException(IntPtr ob)`
`67`	`58`	`/// </summary>`
`68`	`59`	`public new static IntPtr tp_str(IntPtr ob)`
`69`	`60`	`{`
`70`		`- Exception e = ToException(ob);`
	`61`	`+ Exception e = ToException(new BorrowedReference(ob));`
`71`	`62`	`if (e == null)`
`72`	`63`	`{`
`73`	`64`	`return Exceptions.RaiseTypeError("invalid object");`
`@@ -157,7 +148,7 @@ internal static void Shutdown()`
`157`	`148`	`/// pointer.`
`158`	`149`	`/// </summary>`
`159`	`150`	`/// <param name="ob">The python object wrapping </param>`
`160`		`- internal static void SetArgsAndCause(IntPtr ob)`
	`151`	`+ internal static void SetArgsAndCause(BorrowedReference ob)`
`161`	`152`	`{`
`162`	`153`	`// e: A CLR Exception`
`163`	`154`	`Exception e = ExceptionClassObject.ToException(ob);`
`@@ -178,13 +169,13 @@ internal static void SetArgsAndCause(IntPtr ob)`
`178`	`169`	`args = Runtime.PyTuple_New(0);`
`179`	`170`	`}`
`180`	`171`
`181`		`- Marshal.WriteIntPtr(ob, ExceptionOffset.args, args);`
	`172`	`+ Marshal.WriteIntPtr(ob.DangerousGetAddress(), ExceptionOffset.args, args);`
`182`	`173`
`183`	`174`	`if (e.InnerException != null)`
`184`	`175`	`{`
`185`	`176`	`// Note: For an AggregateException, InnerException is only the first of the InnerExceptions.`
`186`		`- IntPtr cause = CLRObject.GetInstHandle(e.InnerException);`
`187`		`- Marshal.WriteIntPtr(ob, ExceptionOffset.cause, cause);`
	`177`	`+ using var cause = CLRObject.GetReference(e.InnerException);`
	`178`	`+ Runtime.PyException_SetCause(ob, cause.Steal());`
`188`	`179`	`}`
`189`	`180`	`}`
`181`