Skip to content

Update new ActivatorCache usage to the new API model. #102931

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

Merged
stephentoub merged 1 commit into from
May 31, 2024
Merged

Update new ActivatorCache usage to the new API model. #102931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3947,7 +3947,7 @@ internal object GetUninitializedObject()
}

// We reuse ActivatorCache here to ensure that we aren't always creating two entries in the cache.
object? obj = GetOrCreateCacheEntry<ActivatorCache>().CreateUninitializedObject(this);
object? obj = cache.CreateUninitializedObject(this);
try
{
cache.CallRefConstructor(obj);
Expand All @@ -3967,11 +3967,7 @@ internal void CallDefaultStructConstructor(ref byte data)
{
Debug.Assert(IsValueType);

if (GenericCache is not ActivatorCache cache)
{
cache = new ActivatorCache(this);
GenericCache = cache;
}
ActivatorCache cache = GetOrCreateCacheEntry<ActivatorCache>();

if (!cache.CtorIsPublic)
{
Expand Down