Skip to content

Add AggressiveInlining to EnsureInitializedCore method to allow delegates stack alloc #122983

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
SergeyTeplyakov wants to merge 4 commits into
base: main
Choose a base branch
from
+10 −1
Open

Add AggressiveInlining to EnsureInitializedCore method to allow delegates stack alloc #122983

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cb5625
Add AggressiveInlining to EnsureInitializedCore method to allow deleg…
SergeyTeplyakov Jan 7, 2026
2e72466
Merge branch 'main' into patch-1
SergeyTeplyakov Jan 7, 2026
5d8df04
Refactor EnsureInitializedCore to use Throw method
SergeyTeplyakov Jan 8, 2026
316d253
Update src/libraries/System.Private.CoreLib/src/System/Threading/Lazy…
SergeyTeplyakov Jan 8, 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
11 changes: 10 additions & 1 deletion src/libraries/System.Private.CoreLib/src/System/Threading/LazyInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Threading
{
Expand Down Expand Up @@ -111,10 +112,18 @@ public static T EnsureInitialized<T>([NotNull] ref T? target, Func<T> valueFacto
/// <returns>The initialized variable</returns>
private static T EnsureInitializedCore<T>([NotNull] ref T? target, Func<T> valueFactory) where T : class
{
T value = valueFactory() ?? throw new InvalidOperationException(SR.Lazy_StaticInit_InvalidOperation);
T? value = valueFactory();
if (value is null)
{
Throw();
}

Comment on lines +115 to +120
Copy link
Contributor

@paulomorgado paulomorgado Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
T? value = valueFactory();
if (value is null)
{
Throw();
}
if (valueFactory() is not { } value)
{
Throw();
}

😄

Copy link
Author

@SergeyTeplyakov SergeyTeplyakov Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't help to make the method more inlinable. So this is just a matter of style.
(Btw, my take is that don't really like the new version, maybe my brain didn't re-wire itself to parse it) :)

Copy link
Contributor

@paulomorgado paulomorgado Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!

One less line of code.

Doesn't necessarily make it faster to compile either.

😄

Interlocked.CompareExchange(ref target, value, null!);
Debug.Assert(target != null);
return target;

[DoesNotReturn]
static void Throw() => throw new InvalidOperationException(SR.Lazy_StaticInit_InvalidOperation);
}

/// <summary>
Expand Down
Loading