[runtime] Add support for keeping the same block alive multiple times. Fixes #18161.

src/ObjCRuntime/Blocks.cs

@@ -564,10 +564,27 @@ unsafe internal static BlockLiteral CreateBlock (Action action)
 	}
 
 	// This class will free the specified block when it's collected by the GC.
-	internal class BlockCollector : TrampolineBlockBase {
+	internal class BlockCollector {
+		IntPtr block;
+		int count;
 		public BlockCollector (IntPtr block)
-			: base (block, owns: true)
 		{
+			this.block = block;
+			count = 1;
+		}
+
+		public void Add (IntPtr block)
+		{
+			if (block != this.block)
+				throw new InvalidOperationException (string.Format ("Can't release the block 0x{0} because this BlockCollector instance is already tracking 0x{1}.", block.ToString ("x"), this.block.ToString ("x")));
+			Interlocked.Increment (ref count);
+		}
+
+		~BlockCollector ()
+		{
+			for (var i = 0; i < count; i++)
+				Runtime.ReleaseBlockOnMainThread (block);
+			count = 0;
 		}
 	}
 #endif

src/ObjCRuntime/Runtime.cs

@@ -2055,7 +2055,11 @@ static Delegate ReleaseBlockWhenDelegateIsCollected (IntPtr block, Delegate @del
 			if (block == IntPtr.Zero)
 				return @delegate;
 
-			block_lifetime_table.Add (@delegate, new BlockCollector (block));
+			if (block_lifetime_table.TryGetValue (@delegate, out var existingCollector)) {
+				existingCollector.Add (block);
+			} else {
+				block_lifetime_table.Add (@delegate, new BlockCollector (block));
+			}
 			return @delegate;
 		}
 

src/servicemanagement.cs

@@ -5,21 +5,19 @@
 
 namespace ServiceManagement {
 	[Native]
-	[NoWatch, NoTV, NoiOS, MacCatalyst (16,0), Mac (13,0)]
-	public enum SMAppServiceStatus : long
-	{
+	[NoWatch, NoTV, NoiOS, MacCatalyst (16, 0), Mac (13, 0)]
+	public enum SMAppServiceStatus : long {
 		NotRegistered,
 		Enabled,
 		RequiresApproval,
 		NotFound,
 	}
 
 	// @interface SMAppService : NSObject
-	[NoWatch, NoTV, NoiOS, MacCatalyst (16,0), Mac (13,0)]
+	[NoWatch, NoTV, NoiOS, MacCatalyst (16, 0), Mac (13, 0)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
-	interface SMAppService
-	{
+	interface SMAppService {
 		[Static]
 		[Export ("loginItemServiceWithIdentifier:")]
 		SMAppService CreateLoginItemService (string identifier);