Skip to content

[TrimmableTypeMap] Fix thread safety in TrimmableTypeMap.Initialize #11049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
+11 −5
Open

[TrimmableTypeMap] Fix thread safety in TrimmableTypeMap.Initialize #11049

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8b0bd4
Initial plan
Copilot Mar 30, 2026
d0513d7
Changes before error encountered
Copilot Mar 30, 2026
5a8136b
Use static Lock for thread-safe TrimmableTypeMap.Initialize
Copilot Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.InteropServices;
Expand All @@ -20,6 +19,7 @@ namespace Microsoft.Android.Runtime;
/// </summary>
class TrimmableTypeMap
{
static readonly Lock s_initLock = new ();
static TrimmableTypeMap? s_instance;

internal static TrimmableTypeMap Instance =>
Expand All @@ -40,11 +40,17 @@ class TrimmableTypeMap
/// </summary>
internal static void Initialize ()
{
var instance = new TrimmableTypeMap ();
var previous = Interlocked.CompareExchange (ref s_instance, instance, null);
Debug.Assert (previous is null, "TrimmableTypeMap must only be created once.");
if (s_instance is not null)
return;

instance.RegisterNatives ();
lock (s_initLock) {
if (s_instance is not null)
return;

var instance = new TrimmableTypeMap ();
instance.RegisterNatives ();
s_instance = instance;
}
}

/// <summary>
Expand Down