Merge branch 'main' into xcode15.3-bump

dalexsoto · May 23, 2024 · c6e6b42 · c6e6b42
2 parents c102d7c + 76cef6c
commit c6e6b42
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/src/ObjCRuntime/Blocks.cs b/src/ObjCRuntime/Blocks.cs
@@ -172,11 +172,6 @@ static string GetBlockSignature (void* trampoline, MethodInfo trampolineMethod)
 			if (!Runtime.DynamicRegistrationSupported)
 				throw ErrorHelper.CreateError (8050, Errors.MX8050 /* BlockLiteral.GetBlockSignature is not supported when the dynamic registrar has been linked away. */);
 
-			// Verify that the function pointer matches the trampoline
-			var functionPointer = trampolineMethod.MethodHandle.GetFunctionPointer ();
-			if (functionPointer != (IntPtr) trampoline)
-				throw ErrorHelper.CreateError (8047, Errors.MX8047 /* The trampoline method {0} does not match the function pointer 0x{1} for the trampolineMethod argument (they're don't refer to the same method) */, trampolineMethod.DeclaringType.FullName + "." + trampolineMethod.Name, ((IntPtr) trampoline).ToString ("x"));
-
 			// Verify that there's at least one parameter, and it must be System.IntPtr, void* or ObjCRuntime.BlockLiteral*.
 			var parameters = trampolineMethod.GetParameters ();
 			if (parameters.Length < 1)

diff --git a/tools/mtouch/Errors.designer.cs b/tools/mtouch/Errors.designer.cs
diff --git a/tools/mtouch/Errors.resx b/tools/mtouch/Errors.resx
@@ -2227,9 +2227,7 @@
 		<value>Unable to find the method '{0}' in the type '{1}'</value>
 	</data>
 
-	<data name="MX8047" xml:space="preserve">
-		<value>The trampoline method {0} does not match the function pointer 0x{1} for the trampolineMethod argument (they're don't refer to the same method).</value>
-	</data>
+	<!-- MX8047: unused -->
 
 	<data name="MX8048" xml:space="preserve">
 		<value>The trampoline method {0} must have at least one parameter.</value>