method binding failure now supports non-Python exception causes

lostmsu · lostmsu · commit e79f041f3a72 · 2021-04-11T01:03:49.000-07:00
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -341,13 +341,13 @@ public MatchedMethod(int kwargsMatched, int defaultsNeeded, object[] margs, int
 
         private readonly struct MismatchedMethod
         {
-            public MismatchedMethod(PythonException exception, MethodBase mb)
+            public MismatchedMethod(Exception exception, MethodBase mb)
             {
                 Exception = exception;
                 Method = mb;
             }
 
-            public PythonException Exception { get; }
+            public Exception Exception { get; }
             public MethodBase Method { get; }
         }
 
@@ -438,8 +438,8 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                     outs: out outs);
                 if (margs == null)
                 {
-                    mismatchedMethods.Add(new MismatchedMethod(PythonException.FetchCurrentRaw(), mi));
-                    Exceptions.Clear();
+                    var mismatchCause = PythonException.FetchCurrent();
+                    mismatchedMethods.Add(new MismatchedMethod(mismatchCause, mi));
                     continue;
                 }
                 if (isOperator)
diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
@@ -94,6 +94,10 @@ internal static PythonException FetchCurrentRaw()
             }
         }
 
+        internal static Exception FetchCurrent()
+            => FetchCurrentOrNull(out _)
+               ?? throw new InvalidOperationException("No exception is set");
+
         private static ExceptionDispatchInfo? TryGetDispatchInfo(BorrowedReference exception)
         {
             if (exception.IsNull) return null;

Original file line number	Diff line number	Diff line change
`@@ -341,13 +341,13 @@ public MatchedMethod(int kwargsMatched, int defaultsNeeded, object[] margs, int`
`341`	`341`
`342`	`342`	`private readonly struct MismatchedMethod`
`343`	`343`	`{`
`344`		`- public MismatchedMethod(PythonException exception, MethodBase mb)`
	`344`	`+ public MismatchedMethod(Exception exception, MethodBase mb)`
`345`	`345`	`{`
`346`	`346`	`Exception = exception;`
`347`	`347`	`Method = mb;`
`348`	`348`	`}`
`349`	`349`
`350`		`- public PythonException Exception { get; }`
	`350`	`+ public Exception Exception { get; }`
`351`	`351`	`public MethodBase Method { get; }`
`352`	`352`	`}`
`353`	`353`
`@@ -438,8 +438,8 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth`
`438`	`438`	`outs: out outs);`
`439`	`439`	`if (margs == null)`
`440`	`440`	`{`
`441`		`- mismatchedMethods.Add(new MismatchedMethod(PythonException.FetchCurrentRaw(), mi));`
`442`		`- Exceptions.Clear();`
	`441`	`+ var mismatchCause = PythonException.FetchCurrent();`
	`442`	`+ mismatchedMethods.Add(new MismatchedMethod(mismatchCause, mi));`
`443`	`443`	`continue;`
`444`	`444`	`}`
`445`	`445`	`if (isOperator)`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,10 @@ internal static PythonException FetchCurrentRaw()`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ internal static Exception FetchCurrent()`
	`98`	`+ => FetchCurrentOrNull(out _)`
	`99`	`+ ?? throw new InvalidOperationException("No exception is set");`
	`100`	`+`
`97`	`101`	`private static ExceptionDispatchInfo? TryGetDispatchInfo(BorrowedReference exception)`
`98`	`102`	`{`
`99`	`103`	`if (exception.IsNull) return null;`