Merge pull request #830 from xamarin/class-less

stephen-hawley · web-flow · commit 115c615347b7 · 2024-02-20T09:43:47.000-05:00
fix rt unmanagedcallers
diff --git a/SwiftRuntimeLibrary/SwiftComparableProxy.cs b/SwiftRuntimeLibrary/SwiftComparableProxy.cs
@@ -23,9 +23,9 @@ public SwiftComparableProxy (ISwiftExistentialContainer container)
 
 		struct Comparable_xam_vtable {
 			[MarshalAs (UnmanagedType.FunctionPtr)]
-			public unsafe delegate* unmanaged<IntPtr, IntPtr, bool> opEqualFunc;
+			public unsafe delegate* unmanaged<IntPtr, IntPtr, int> opEqualFunc;
 			[MarshalAs (UnmanagedType.FunctionPtr)]
-			public unsafe delegate* unmanaged<IntPtr, IntPtr, bool> opLessFunc;
+			public unsafe delegate* unmanaged<IntPtr, IntPtr, int> opLessFunc;
 		}
 
 		static Comparable_xam_vtable vtableIComparable;
@@ -34,24 +34,24 @@ static SwiftComparableProxy ()
 			XamSetVTable ();
 		}
 
-		[UnmanagedCallersOnly]		
-		static bool EqFunc (IntPtr oneptr, IntPtr twoptr)
+		[UnmanagedCallersOnly]
+		static int EqFunc (IntPtr oneptr, IntPtr twoptr)
 		{
 			if (oneptr == twoptr)
-				return true;
+				return 1;
 			var one = SwiftObjectRegistry.Registry.ProxyForEveryProtocolHandle<ISwiftComparable> (oneptr);
 			var two = SwiftObjectRegistry.Registry.ProxyForEveryProtocolHandle<ISwiftComparable> (twoptr);
-			return one.OpEquals (two);
+			return one.OpEquals (two) ? 1 : 0;
 		}
 
 		[UnmanagedCallersOnly]
-		static bool LessFunc (IntPtr oneptr, IntPtr twoptr)
+		static int LessFunc (IntPtr oneptr, IntPtr twoptr)
 		{
 			if (oneptr == twoptr)
-				return false;
+				return 0;
 			var one = SwiftObjectRegistry.Registry.ProxyForEveryProtocolHandle<ISwiftComparable> (oneptr);
 			var two = SwiftObjectRegistry.Registry.ProxyForEveryProtocolHandle<ISwiftComparable> (twoptr);
-			return one.OpLess (two);
+			return one.OpLess (two) ? 1 : 0;
 		}
 
 		static void XamSetVTable ()
diff --git a/SwiftRuntimeLibrary/SwiftEquatableProxy.cs b/SwiftRuntimeLibrary/SwiftEquatableProxy.cs
@@ -22,7 +22,7 @@ public SwiftEquatableProxy (ISwiftExistentialContainer container)
 
 		struct Equatable_xam_vtable {
 			public delegate bool Delfunc0 (IntPtr one, IntPtr two);
-			public unsafe delegate *unmanaged<IntPtr, IntPtr, byte> func0;
+			public unsafe delegate *unmanaged<IntPtr, IntPtr, int> func0;
 		}
 
 		static Equatable_xam_vtable vtableIEquatable;
@@ -32,15 +32,15 @@ static SwiftEquatableProxy ()
 		}
 
 		[UnmanagedCallersOnly]
-		static byte EqFunc (IntPtr oneptr, IntPtr twoptr)
+		static int EqFunc (IntPtr oneptr, IntPtr twoptr)
 		{
 			if (oneptr == twoptr)
 				return 1;
 
 			var one = SwiftObjectRegistry.Registry.ProxyForEveryProtocolHandle<ISwiftEquatable> (oneptr);
 			var two = SwiftObjectRegistry.Registry.ProxyForEveryProtocolHandle<ISwiftEquatable> (twoptr);
 
-			return one.OpEquals (two) ? (byte)1 : (byte)0;
+			return one.OpEquals (two) ? 1 : 0;
 		}
 
 		static void XamSetVTable ()

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public SwiftEquatableProxy (ISwiftExistentialContainer container)`
`22`	`22`
`23`	`23`	`struct Equatable_xam_vtable {`
`24`	`24`	`public delegate bool Delfunc0 (IntPtr one, IntPtr two);`
`25`		`- public unsafe delegate *unmanaged<IntPtr, IntPtr, byte> func0;`
	`25`	`+ public unsafe delegate *unmanaged<IntPtr, IntPtr, int> func0;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`static Equatable_xam_vtable vtableIEquatable;`
`@@ -32,15 +32,15 @@ static SwiftEquatableProxy ()`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`[UnmanagedCallersOnly]`
`35`		`- static byte EqFunc (IntPtr oneptr, IntPtr twoptr)`
	`35`	`+ static int EqFunc (IntPtr oneptr, IntPtr twoptr)`
`36`	`36`	`{`
`37`	`37`	`if (oneptr == twoptr)`
`38`	`38`	`return 1;`
`39`	`39`
`40`	`40`	`var one = SwiftObjectRegistry.Registry.ProxyForEveryProtocolHandle<ISwiftEquatable> (oneptr);`
`41`	`41`	`var two = SwiftObjectRegistry.Registry.ProxyForEveryProtocolHandle<ISwiftEquatable> (twoptr);`
`42`	`42`
`43`		`- return one.OpEquals (two) ? (byte)1 : (byte)0;`
	`43`	`+ return one.OpEquals (two) ? 1 : 0;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`static void XamSetVTable ()`