Skip to content

remove RuntimeAsyncTaskCore #122505

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
max-charlamb merged 4 commits into from
Dec 17, 2025
Merged

remove RuntimeAsyncTaskCore #122505

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1da692
remove RuntimeAsyncTaskCore
max-charlamb Dec 12, 2025
24b1d4a
fix
max-charlamb Dec 12, 2025
56f4d42
comments
max-charlamb Dec 16, 2025
93e3035
remove extra spaces
max-charlamb Dec 16, 2025
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
77 changes: 37 additions & 40 deletions ...oreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncHelpers.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,28 @@ public ref byte GetResultStorageOrNull()
}
}

[StructLayout(LayoutKind.Explicit)]
internal unsafe ref struct AsyncDispatcherInfo
{
// Dispatcher info for next dispatcher present on stack, or
// null if none.
[FieldOffset(0)]
public AsyncDispatcherInfo* Next;

// Next continuation the dispatcher will process.
#if TARGET_64BIT
[FieldOffset(8)]
#else
[FieldOffset(4)]
#endif
public Continuation? NextContinuation;

// Information about current task dispatching, to be used for async
// stackwalking.
[ThreadStatic]
internal static unsafe AsyncDispatcherInfo* t_current; // Debugger depends on the exact name of this field.
}

public static partial class AsyncHelpers
{
#if FEATURE_INTERPRETER
Expand Down Expand Up @@ -417,19 +439,19 @@ private unsafe void DispatchContinuations()
ExecutionAndSyncBlockStore contexts = default;
contexts.Push();

RuntimeAsyncTaskCore.DispatcherInfo dispatcherInfo;
dispatcherInfo.Next = RuntimeAsyncTaskCore.t_dispatcherInfo;
dispatcherInfo.NextContinuation = MoveContinuationState();
RuntimeAsyncTaskCore.t_dispatcherInfo = &dispatcherInfo;
AsyncDispatcherInfo asyncDispatcherInfo;
asyncDispatcherInfo.Next = AsyncDispatcherInfo.t_current;
asyncDispatcherInfo.NextContinuation = MoveContinuationState();
AsyncDispatcherInfo.t_current = &asyncDispatcherInfo;

while (true)
{
Debug.Assert(dispatcherInfo.NextContinuation != null);
Debug.Assert(asyncDispatcherInfo.NextContinuation != null);
try
{
Continuation curContinuation = dispatcherInfo.NextContinuation;
Continuation curContinuation = asyncDispatcherInfo.NextContinuation;
Continuation? nextContinuation = curContinuation.Next;
dispatcherInfo.NextContinuation = nextContinuation;
asyncDispatcherInfo.NextContinuation = nextContinuation;

ref byte resultLoc = ref nextContinuation != null ? ref nextContinuation.GetResultStorageOrNull() : ref GetResultStorage();
Continuation? newContinuation = curContinuation.ResumeInfo->Resume(curContinuation, ref resultLoc);
Expand All @@ -439,13 +461,13 @@ private unsafe void DispatchContinuations()
newContinuation.Next = nextContinuation;
HandleSuspended();
contexts.Pop();
RuntimeAsyncTaskCore.t_dispatcherInfo = dispatcherInfo.Next;
AsyncDispatcherInfo.t_current = asyncDispatcherInfo.Next;
return;
}
}
catch (Exception ex)
{
Continuation? handlerContinuation = UnwindToPossibleHandler(dispatcherInfo.NextContinuation);
Continuation? handlerContinuation = UnwindToPossibleHandler(asyncDispatcherInfo.NextContinuation);
if (handlerContinuation == null)
{
// Tail of AsyncTaskMethodBuilderT.SetException
Expand All @@ -455,7 +477,7 @@ private unsafe void DispatchContinuations()

contexts.Pop();

RuntimeAsyncTaskCore.t_dispatcherInfo = dispatcherInfo.Next;
AsyncDispatcherInfo.t_current = asyncDispatcherInfo.Next;

if (!successfullySet)
{
Expand All @@ -466,16 +488,16 @@ private unsafe void DispatchContinuations()
}

handlerContinuation.SetException(ex);
dispatcherInfo.NextContinuation = handlerContinuation;
asyncDispatcherInfo.NextContinuation = handlerContinuation;
}

if (dispatcherInfo.NextContinuation == null)
if (asyncDispatcherInfo.NextContinuation == null)
{
bool successfullySet = TrySetResult(m_result);

contexts.Pop();

RuntimeAsyncTaskCore.t_dispatcherInfo = dispatcherInfo.Next;
AsyncDispatcherInfo.t_current = asyncDispatcherInfo.Next;

if (!successfullySet)
{
Expand All @@ -485,10 +507,10 @@ private unsafe void DispatchContinuations()
return;
}

if (QueueContinuationFollowUpActionIfNecessary(dispatcherInfo.NextContinuation))
if (QueueContinuationFollowUpActionIfNecessary(asyncDispatcherInfo.NextContinuation))
{
contexts.Pop();
RuntimeAsyncTaskCore.t_dispatcherInfo = dispatcherInfo.Next;
AsyncDispatcherInfo.t_current = asyncDispatcherInfo.Next;
return;
}
}
Expand Down Expand Up @@ -583,31 +605,6 @@ private bool QueueContinuationFollowUpActionIfNecessary(Continuation continuatio
};
}

internal static class RuntimeAsyncTaskCore
{
[StructLayout(LayoutKind.Explicit)]
internal unsafe ref struct DispatcherInfo
{
// Dispatcher info for next dispatcher present on stack, or
// null if none.
[FieldOffset(0)]
public DispatcherInfo* Next;

// Next continuation the dispatcher will process.
#if TARGET_64BIT
[FieldOffset(8)]
#else
[FieldOffset(4)]
#endif
public Continuation? NextContinuation;
}

// Information about current task dispatching, to be used for async
// stackwalking.
[ThreadStatic]
internal static unsafe DispatcherInfo* t_dispatcherInfo;
}

// Change return type to RuntimeAsyncTask<T?> -- no benefit since this is used for Task returning thunks only
#pragma warning disable CA1859
// When a Task-returning thunk gets a continuation result
Expand Down