Merge pull request #826 from xamarin/bad-exceptions

stephen-hawley · web-flow · commit 5f79ca482f99 · 2024-02-15T09:43:36.000-05:00
fixed issues with closures that throw and have args
diff --git a/SwiftRuntimeLibrary/SwiftClosureRepresentation.cs b/SwiftRuntimeLibrary/SwiftClosureRepresentation.cs
@@ -80,7 +80,7 @@ public static void FuncCallbackVoidMaybeThrows (IntPtr retValPtr, IntPtr refPtr)
 		[UnmanagedCallersOnly]
 		public static void FuncCallbackMaybeThrows (IntPtr retValPtr, IntPtr args, IntPtr refPtr)
 		{
-			FuncCallbackMaybeThrowsImpl (retValPtr, IntPtr.Zero, refPtr);
+			FuncCallbackMaybeThrowsImpl (retValPtr, args, refPtr);
 		}
 
 		static void FuncCallbackMaybeThrowsImpl (IntPtr retValPtr, IntPtr args, IntPtr refPtr)
@@ -114,8 +114,12 @@ static void FuncCallbackMaybeThrowsImpl (IntPtr retValPtr, IntPtr args, IntPtr r
 #endif
 			var argumentValues = args != IntPtr.Zero ? StructMarshal.Marshaler.MarshalSwiftTupleMemoryToNet (args, delInfo.Item2) : null;
 #if DEBUG
-			//foreach (var arg in argumentValues) {
-			//	Console.WriteLine ($"arg: {arg} type: {arg.GetType ().Name}");
+			//if (argumentValues is not null) {
+			//	foreach (var arg in argumentValues) {
+			//		Console.WriteLine ($"arg: {arg} type: {arg.GetType ().Name}");
+			//	}
+			//} else {
+			//	Console.WriteLine ("argumentValues is null");
 			//}
 #endif
 
diff --git a/SwiftRuntimeLibrary/SwiftMarshal/StructMarshal.cs b/SwiftRuntimeLibrary/SwiftMarshal/StructMarshal.cs
@@ -1362,14 +1362,14 @@ public bool ExceptionReturnContainsSwiftError (IntPtr swiftMedusaTuple, Type t)
 		bool ExceptionReturnContainsSwiftError (IntPtr swiftMeduaTuple, SwiftTupleMap tMap)
 		{
 			//#if DEBUG
-			//			Console.WriteLine("Given pointer " + p.ToString("X8"));
+			//			Console.WriteLine("Given pointer " + swiftMeduaTuple.ToString("X8"));
 			//			Console.WriteLine($"And a tuple map with ${tMap.Offsets.Length} offsets");
 			//			foreach (int i in tMap.Offsets)
 			//			{
 			//				Console.Write($"{i}, ");
 			//			}
 			//			Console.WriteLine();
-			//			Memory.Dump(p, 40);
+			//			Memory.Dump(swiftMeduaTuple, 40);
 			//#endif
 			var boolPtr = swiftMeduaTuple + tMap.Offsets [tMap.Offsets.Length - 1];
 			//#if DEBUG
