Rework the lifecycle of singleton instances#4080

Merged

mattleibow merged 29 commits into

mono:mainfrom

ramezgerges:dev/issue-3817-fix-singleton-init

Jun 10, 2026

Commits on Jun 9, 2026

Fix singleton cctor cycle (#3817) by replacing pre-registration with lazy init

ramezgerges
and
claude
committed
Restore [ModuleInitializer] for the native-library version check only

ramezgerges
and
claude
committed
Narrow promote-existing race by setting IgnorePublicDispose under the HD lock

ramezgerges
and
claude
committed
Remove incorrect SKPath stale-HD-entry comment

ramezgerges
and
claude
committed
Make IgnorePublicDispose a one-way latch via private setter

ramezgerges
and
claude
committed
Eager-init SKFontStyle singletons via cctor

ramezgerges
and
claude
committed
Atomicize singleton init via recursive HD lock; rename immortal→dispose-protected

ramezgerges
and
claude
committed
Document race-safety reasoning; drop unreliable #3817 repro test

ramezgerges
and
claude
committed
Migrate remaining manual PreventPublicDisposal callers to GetDisposeProtectedObject

ramezgerges
and
claude
committed
Drop redundant write lock from PreventPublicDisposal

ramezgerges
and
claude
committed
Drop LockRecursionPolicy.SupportsRecursion (no longer needed)

ramezgerges
and
claude
committed
Add SKSingletonInitTest covering the new dispose-protected init mechanism

ramezgerges
and
claude
committed
Harden dispose-protected guard, fix comment accuracy, add interleaving tests

authored and
ramezgerges
committed
Fix stream-callback NREs: restore RevokeOwnership
ramezgerges
committed
Add standalone pure-process singleton-init regression test

authored and
ramezgerges
committed
Add concurrency/lifecycle corner-case tests for the singleton rework

authored and
ramezgerges
committed
Add re-entrancy contract tests for HandleDictionary.GetOrAddObject

authored and
ramezgerges
committed
Guard AssemblyLoadContext singleton test for .NET Framework

authored and
ramezgerges
committed
Fix indentation in HandleDictionary re-entrancy test

authored and
ramezgerges
committed
Guard concurrency tests for single-threaded WASM and 32-bit targets

authored and
ramezgerges
committed
Harden concurrency test joins and cold-start rethrow

authored and
ramezgerges
committed
Make concurrency test helpers net48-compatible

authored and
ramezgerges
committed
Make singleton/lifecycle tests robust on the Mono interpreter (device CI)

authored and
ramezgerges
committed
Isolate threading and refcount-sensitive tests into a serialized collection

authored and
ramezgerges
committed
Hold native-wrapper arguments alive across P/Invoke calls

ramezgerges
and
claude
committed
Keep 'this' alive across instance P/Invoke calls (1C lifetime hardening)

ramezgerges
and
claude
committed
Extend lifetime KeepAlives to Skottie/SceneGraph/Resources bindings

ramezgerges
and
claude
committed
Fix teardown heap corruption: never unref immortal Skia singletons

ramezgerges
and
claude
committed

Commits on Jun 10, 2026

Skip PR #4080 use-after-free test on single-threaded WASM

ramezgerges
and
claude
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rework the lifecycle of singleton instances#4080

Rework the lifecycle of singleton instances#4080
mattleibow merged 29 commits into
mono:mainfrom
ramezgerges:dev/issue-3817-fix-singleton-init

Commits on Jun 9, 2026

Fix singleton cctor cycle (#3817) by replacing pre-registration with lazy init

Restore [ModuleInitializer] for the native-library version check only

Narrow promote-existing race by setting IgnorePublicDispose under the HD lock

Remove incorrect SKPath stale-HD-entry comment

Make IgnorePublicDispose a one-way latch via private setter

Eager-init SKFontStyle singletons via cctor

Atomicize singleton init via recursive HD lock; rename immortal→dispose-protected

Document race-safety reasoning; drop unreliable #3817 repro test

Migrate remaining manual PreventPublicDisposal callers to GetDisposeProtectedObject

Drop redundant write lock from PreventPublicDisposal

Drop LockRecursionPolicy.SupportsRecursion (no longer needed)

Add SKSingletonInitTest covering the new dispose-protected init mechanism

Harden dispose-protected guard, fix comment accuracy, add interleaving tests

Fix stream-callback NREs: restore RevokeOwnership

Add standalone pure-process singleton-init regression test

Add concurrency/lifecycle corner-case tests for the singleton rework

Add re-entrancy contract tests for HandleDictionary.GetOrAddObject

Guard AssemblyLoadContext singleton test for .NET Framework

Fix indentation in HandleDictionary re-entrancy test

Guard concurrency tests for single-threaded WASM and 32-bit targets

Harden concurrency test joins and cold-start rethrow

Make concurrency test helpers net48-compatible

Make singleton/lifecycle tests robust on the Mono interpreter (device CI)

Isolate threading and refcount-sensitive tests into a serialized collection

Hold native-wrapper arguments alive across P/Invoke calls

Keep 'this' alive across instance P/Invoke calls (1C lifetime hardening)

Extend lifetime KeepAlives to Skottie/SceneGraph/Resources bindings

Fix teardown heap corruption: never unref immortal Skia singletons

Commits on Jun 10, 2026

Skip PR #4080 use-after-free test on single-threaded WASM