From bd6e6a078a359ca28e180a77d2565094501e8e66 Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Tue, 1 Sep 2026 09:32:59 -0400
Subject: [PATCH] Restore current task tracking for runtime async dispatch
 (#132969)

---
 .../src/System/Runtime/CompilerServices/AsyncHelpers.CoreCLR.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncHelpers.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncHelpers.CoreCLR.cs
index 90f74e4b867457..8277c404a62c50 100644
--- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncHelpers.CoreCLR.cs
+++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncHelpers.CoreCLR.cs
@@ -957,6 +957,7 @@ private unsafe void DispatchContinuations()
                 AsyncDispatcherInfo asyncDispatcherInfo;
                 asyncDispatcherInfo.Next = refDispatcherInfo;
                 asyncDispatcherInfo.NextContinuation = MoveContinuationState();
+                asyncDispatcherInfo.CurrentTask = this;
                 refDispatcherInfo = &asyncDispatcherInfo;
 
                 while (true)