fixed __cause__ on overload bind failure and array conversion

lostmsu · lostmsu · commit a95945bf7df3 · 2021-04-13T17:33:08.000-07:00
also: added debug check
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -814,9 +814,14 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
 
         private static void SetConversionError(IntPtr value, Type target)
         {
+            // PyObject_Repr might clear the error
+            Runtime.PyErr_Fetch(out var causeType, out var causeVal, out var causeTrace);
+
             IntPtr ob = Runtime.PyObject_Repr(value);
             string src = Runtime.GetManagedString(ob);
             Runtime.XDecref(ob);
+
+            Runtime.PyErr_Restore(causeType, causeVal, causeTrace);
             Exceptions.RaiseTypeError($"Cannot convert {src} to {target}");
         }
 
diff --git a/src/runtime/finalizer.cs b/src/runtime/finalizer.cs
@@ -54,7 +54,7 @@ public class IncorrectRefCountException : Exception
             public IncorrectRefCountException(IntPtr ptr)
             {
                 PyPtr = ptr;
-                IntPtr pyname = Runtime.PyObject_Unicode(PyPtr);
+                IntPtr pyname = Runtime.PyObject_Str(PyPtr);
                 string name = Runtime.GetManagedString(pyname);
                 Runtime.XDecref(pyname);
                 _message = $"<{name}> may has a incorrect ref count";
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -876,7 +876,7 @@ protected static void AppendArgumentTypes(StringBuilder to, IntPtr args)
                     {
                         try
                         {
-                            var description = Runtime.PyObject_Unicode(type);
+                            var description = Runtime.PyObject_Str(type);
                             if (description != IntPtr.Zero)
                             {
                                 to.Append(Runtime.GetManagedString(description));
@@ -926,7 +926,9 @@ internal virtual IntPtr Invoke(IntPtr inst, IntPtr args, IntPtr kw, MethodBase i
                 }
 
                 value.Append(": ");
+                Runtime.PyErr_Fetch(out var errType, out var errVal, out var errTrace);
                 AppendArgumentTypes(to: value, args);
+                Runtime.PyErr_Restore(errType, errVal, errTrace);
                 Exceptions.RaiseTypeError(value.ToString());
                 return IntPtr.Zero;
             }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -1040,7 +1040,7 @@ public string Repr()
         /// </remarks>
         public override string ToString()
         {
-            IntPtr strval = Runtime.PyObject_Unicode(obj);
+            IntPtr strval = Runtime.PyObject_Str(obj);
             string result = Runtime.GetManagedString(strval);
             Runtime.XDecref(strval);
             return result;
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1,8 +1,7 @@
-using System.Reflection.Emit;
 using System;
+using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Runtime.InteropServices;
-using System.Security;
 using System.Text;
 using System.Threading;
 using System.Collections.Generic;
@@ -1127,13 +1126,18 @@ internal static int PyObject_Compare(IntPtr value1, IntPtr value2)
         internal static nint PyObject_Hash(IntPtr op) => Delegates.PyObject_Hash(op);
 
 
-        internal static IntPtr PyObject_Repr(IntPtr pointer) => Delegates.PyObject_Repr(pointer);
-
-
-        internal static IntPtr PyObject_Str(IntPtr pointer) => Delegates.PyObject_Str(pointer);
+        internal static IntPtr PyObject_Repr(IntPtr pointer)
+        {
+            Debug.Assert(PyErr_Occurred() == IntPtr.Zero);
+            return Delegates.PyObject_Repr(pointer);
+        }
 
 
-        internal static IntPtr PyObject_Unicode(IntPtr pointer) => Delegates.PyObject_Unicode(pointer);
+        internal static IntPtr PyObject_Str(IntPtr pointer)
+        {
+            Debug.Assert(PyErr_Occurred() == IntPtr.Zero);
+            return Delegates.PyObject_Str(pointer);
+        }
 
 
         internal static IntPtr PyObject_Dir(IntPtr pointer) => Delegates.PyObject_Dir(pointer);
@@ -2322,7 +2326,6 @@ static Delegates()
                 PyObject_Hash = (delegate* unmanaged[Cdecl]<IntPtr, IntPtr>)GetFunctionByName(nameof(PyObject_Hash), GetUnmanagedDll(_PythonDll));
                 PyObject_Repr = (delegate* unmanaged[Cdecl]<IntPtr, IntPtr>)GetFunctionByName(nameof(PyObject_Repr), GetUnmanagedDll(_PythonDll));
                 PyObject_Str = (delegate* unmanaged[Cdecl]<IntPtr, IntPtr>)GetFunctionByName(nameof(PyObject_Str), GetUnmanagedDll(_PythonDll));
-                PyObject_Unicode = (delegate* unmanaged[Cdecl]<IntPtr, IntPtr>)GetFunctionByName("PyObject_Str", GetUnmanagedDll(_PythonDll));
                 PyObject_Dir = (delegate* unmanaged[Cdecl]<IntPtr, IntPtr>)GetFunctionByName(nameof(PyObject_Dir), GetUnmanagedDll(_PythonDll));
                 PyObject_GetBuffer = (delegate* unmanaged[Cdecl]<IntPtr, ref Py_buffer, int, int>)GetFunctionByName(nameof(PyObject_GetBuffer), GetUnmanagedDll(_PythonDll));
                 PyBuffer_Release = (delegate* unmanaged[Cdecl]<ref Py_buffer, void>)GetFunctionByName(nameof(PyBuffer_Release), GetUnmanagedDll(_PythonDll));
@@ -2607,7 +2610,6 @@ static Delegates()
             internal static delegate* unmanaged[Cdecl]<IntPtr, IntPtr> PyObject_Hash { get; }
             internal static delegate* unmanaged[Cdecl]<IntPtr, IntPtr> PyObject_Repr { get; }
             internal static delegate* unmanaged[Cdecl]<IntPtr, IntPtr> PyObject_Str { get; }
-            internal static delegate* unmanaged[Cdecl]<IntPtr, IntPtr> PyObject_Unicode { get; }
             internal static delegate* unmanaged[Cdecl]<IntPtr, IntPtr> PyObject_Dir { get; }
             internal static delegate* unmanaged[Cdecl]<IntPtr, ref Py_buffer, int, int> PyObject_GetBuffer { get; }
             internal static delegate* unmanaged[Cdecl]<ref Py_buffer, void> PyBuffer_Release { get; }

Original file line number	Diff line number	Diff line change
`@@ -814,9 +814,14 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo`
`814`	`814`
`815`	`815`	`private static void SetConversionError(IntPtr value, Type target)`
`816`	`816`	`{`
	`817`	`+ // PyObject_Repr might clear the error`
	`818`	`+ Runtime.PyErr_Fetch(out var causeType, out var causeVal, out var causeTrace);`
	`819`	`+`
`817`	`820`	`IntPtr ob = Runtime.PyObject_Repr(value);`
`818`	`821`	`string src = Runtime.GetManagedString(ob);`
`819`	`822`	`Runtime.XDecref(ob);`
	`823`	`+`
	`824`	`+ Runtime.PyErr_Restore(causeType, causeVal, causeTrace);`
`820`	`825`	`Exceptions.RaiseTypeError($"Cannot convert {src} to {target}");`
`821`	`826`	`}`
`822`	`827`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public class IncorrectRefCountException : Exception`
`54`	`54`	`public IncorrectRefCountException(IntPtr ptr)`
`55`	`55`	`{`
`56`	`56`	`PyPtr = ptr;`
`57`		`- IntPtr pyname = Runtime.PyObject_Unicode(PyPtr);`
	`57`	`+ IntPtr pyname = Runtime.PyObject_Str(PyPtr);`
`58`	`58`	`string name = Runtime.GetManagedString(pyname);`
`59`	`59`	`Runtime.XDecref(pyname);`
`60`	`60`	`_message = $"<{name}> may has a incorrect ref count";`
Original file line number	Diff line number	Diff line change
`@@ -876,7 +876,7 @@ protected static void AppendArgumentTypes(StringBuilder to, IntPtr args)`
`876`	`876`	`{`
`877`	`877`	`try`
`878`	`878`	`{`
`879`		`- var description = Runtime.PyObject_Unicode(type);`
	`879`	`+ var description = Runtime.PyObject_Str(type);`
`880`	`880`	`if (description != IntPtr.Zero)`
`881`	`881`	`{`
`882`	`882`	`to.Append(Runtime.GetManagedString(description));`
`@@ -926,7 +926,9 @@ internal virtual IntPtr Invoke(IntPtr inst, IntPtr args, IntPtr kw, MethodBase i`
`926`	`926`	`}`
`927`	`927`
`928`	`928`	`value.Append(": ");`
	`929`	`+ Runtime.PyErr_Fetch(out var errType, out var errVal, out var errTrace);`
`929`	`930`	`AppendArgumentTypes(to: value, args);`
	`931`	`+ Runtime.PyErr_Restore(errType, errVal, errTrace);`
`930`	`932`	`Exceptions.RaiseTypeError(value.ToString());`
`931`	`933`	`return IntPtr.Zero;`
`932`	`934`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1040,7 +1040,7 @@ public string Repr()`
`1040`	`1040`	`/// </remarks>`
`1041`	`1041`	`public override string ToString()`
`1042`	`1042`	`{`
`1043`		`- IntPtr strval = Runtime.PyObject_Unicode(obj);`
	`1043`	`+ IntPtr strval = Runtime.PyObject_Str(obj);`
`1044`	`1044`	`string result = Runtime.GetManagedString(strval);`
`1045`	`1045`	`Runtime.XDecref(strval);`
`1046`	`1046`	`return result;`