JIT: Support async contexts for OSR/EnC - #121672

Merged
jakobbotsch merged 13 commits into
dotnet:mainfrom
jakobbotsch:fix-osr-enc-async-state
Jan 6, 2026
Merged

JIT: Support async contexts for OSR/EnC#121672
jakobbotsch merged 13 commits into
dotnet:mainfrom
jakobbotsch:fix-osr-enc-async-state

Conversation

@jakobbotsch

@jakobbotschjakobbotsch commented Nov 15, 2025•
edited
Loading

Copy link
Copy Markdown
Member

Now that async contexts are stored around the body of async methods we need to take special care that these pieces of state get restored on OSR and EnC transitions.

@jakobbotsch
JIT: Support async contexts for OSR/EnC
aed98e1
Now that async contexts are stored around the body of async methods we
need to take special case that these pieces of state get restored on OSR
and EnC transitions.
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 15, 2025
@dotnet-policy-service

dotnet-policy-serviceBot commented Nov 15, 2025

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

jakobbotsch
jakobbotsch commented Nov 15, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/flowgraph.cpp
This was referenced Nov 16, 2025
Open
Open
Closed
@jakobbotsch

jakobbotsch commented Nov 16, 2025

Copy link
Copy Markdown
MemberAuthor

Still have various x86 functions like GetLocallocSPOffset that probably need to be taught about the two new specially allocated context variables.

CopilotAI mentioned this pull request Nov 24, 2025
Merged
@akoeplinger

akoeplinger commented Nov 24, 2025

Copy link
Copy Markdown
Member

Sorry, for some reason Copilot added a Fixes message for this PR in #121923 🤦

jakobbotsch
jakobbotsch commented Dec 10, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/lclvars.cpp
@build-analysisbuild-analysisBot mentioned this pull request Dec 10, 2025
Open
@jakobbotsch

jakobbotsch commented Dec 11, 2025

Copy link
Copy Markdown
MemberAuthor

cc @dotnet/jit-contrib PTAL @AndyAyersMS

Need to revert async test enabling before merging, but it should be ready for review.

Also cc @VSadov@jkotas for the VM parts. To avoid changing JIT32 GC info I changed GetSizeOfFrameHeaderForEnC to make the determination if the two contexts are present based on MethodDesc::RequiresAsyncContextSaveAndRestore. But we could also change the JIT32 GC info if that is preferred. Thoughts?

@jkotas

jkotas commented Dec 11, 2025

Copy link
Copy Markdown
Member

we could also change the JIT32 GC info if that is preferred. Thoughts?

I think it is ok to take this shortcut - if it is just for EnC on x86.

@jakobbotsch
jakobbotsch marked this pull request as ready for review December 11, 2025 13:43
CopilotAI review requested due to automatic review settings December 11, 2025 13:43
CopilotAI reviewed Dec 11, 2025
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This pull request adds support for async contexts (ExecutionContext and SynchronizationContext) in OSR (On Stack Replacement) and EnC (Edit and Continue) scenarios. The JIT now stores these contexts in the stack frame and ensures they are properly preserved when transitioning between tiered compilation levels.

Key Changes:

  • Async context locals are now allocated in the EnC frame header alongside other preserved state like the monitor acquired flag
  • OSR methods reuse the async context values from the tier0 frame instead of recapturing them
  • Frame layout calculations updated across all architectures to account for the two new async context slots

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

Show a summary per file
FileDescription
src/tests/async/execution-context/execution-context.csAdds test for verifying async context restoration across OSR transitions
src/coreclr/vm/gc_unwind_x86.inlUpdates x86 EnC frame header size calculation to include async context slots
src/coreclr/vm/eetwain.cppUpdates EnC frame header size calls to pass MethodDesc parameter
src/coreclr/jit/lclvars.cppAdds lvaAllocAsyncContexts helper and integrates async context allocation into frame layout; handles OSR locals properly
src/coreclr/jit/flowgraph.cppMarks monitor acquired local as OSR local when in OSR mode
src/coreclr/jit/compiler.hDeclares new lvaAllocAsyncContexts helper method
src/coreclr/jit/compiler.cppRecords async context offsets in patchpoint info for OSR; updates OSR local validation
src/coreclr/jit/codegenxarch.cppUpdates x64 EnC preserved area size to include async contexts
src/coreclr/jit/codegenriscv64.cppUpdates RISC-V64 frame calculations for async contexts
src/coreclr/jit/codegenloongarch64.cppUpdates LoongArch64 frame calculations and EnC preserved area for async contexts
src/coreclr/jit/codegencommon.cppDisables contiguous GC pointer tracking when async contexts are present
src/coreclr/jit/codegenarmarch.cppUpdates ARM/ARM64 EnC preserved area size for async contexts
src/coreclr/jit/codegenarm64.cppUpdates ARM64 funclet frame size calculations for async contexts
src/coreclr/jit/codegenarm.cppUpdates ARM32 funclet frame size calculations for async contexts
src/coreclr/jit/async.cppSkips context capture call for OSR methods (already done in tier0)
src/coreclr/inc/patchpointinfo.hAdds async context offset fields and accessor methods to PatchpointInfo structure
src/coreclr/inc/jiteeversionguid.hUpdates JIT-EE interface version GUID
docs/design/coreclr/botr/clr-abi.mdDocuments async context preservation requirements for EnC

Comment threadsrc/coreclr/vm/gc_unwind_x86.inl Outdated
Comment threadsrc/coreclr/jit/lclvars.cpp Outdated
Comment threadsrc/tests/async/execution-context/execution-context.cs
@build-analysisbuild-analysisBot mentioned this pull request Dec 11, 2025
Open
3 tasks
@jkotas

jkotas commented Dec 11, 2025

Copy link
Copy Markdown
Member

The VM changes LGTM

AndyAyersMS
AndyAyersMS approved these changes Dec 12, 2025
View reviewed changes

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

JIT changes look good.

@build-analysisbuild-analysisBot mentioned this pull request Jan 2, 2026
Open
3 tasks
@build-analysisbuild-analysisBot mentioned this pull request Jan 6, 2026
Closed
@jakobbotsch
jakobbotsch merged commit 0bdd768 into dotnet:mainJan 6, 2026
115 of 118 checks passed
@jakobbotsch
jakobbotsch deleted the fix-osr-enc-async-state branch January 6, 2026 16:18
This was referenced Jan 9, 2026
Closed
Merged
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Feb 6, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@jkotasjkotasAwaiting requested review from jkotas
@VSadovVSadovAwaiting requested review from VSadov

Assignees

@jakobbotschjakobbotsch

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMIruntime-async

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jakobbotsch@akoeplinger@jkotas@AndyAyersMS
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
JIT: Support async contexts for OSR/EnC - #121672
Merged
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Jan 6, 2026
Merged
JIT: Support async contexts for OSR/EnC#121672
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Nov 15, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Now that async contexts are stored around the body of async methods we need to take special care that these pieces of state get restored on OSR and EnC transitions.
@jakobbotsch
JIT: Support async contexts for OSR/EnC
aed98e1
Now that async contexts are stored around the body of async methods we
need to take special case that these pieces of state get restored on OSR
and EnC transitions.
@github-actionsgithub-actionsBot
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Nov 15, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Nov 15, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch

See info in area-owners.md if you want to be subscribed.
jakobbotsch
jakobbotsch
commented
Nov 15, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/flowgraph.cpp

This was referenced Nov 16, 2025

Open


Open


Closed

@jakobbotsch
jakobbotsch
commented
Nov 16, 2025

Copy link


Copy Markdown

MemberAuthor
Still have various x86 functions like GetLocallocSPOffset that probably need to be taught about the two new specially allocated context variables.
CopilotAI
mentioned this pull request
Nov 24, 2025
 Merged

@akoeplinger
akoeplinger
commented
Nov 24, 2025

Copy link


Copy Markdown

Member
Sorry, for some reason Copilot added a Fixes message for this PR in #121923 🤦
jakobbotsch
jakobbotsch
commented
Dec 10, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/lclvars.cpp
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 10, 2025

Open

@jakobbotsch
jakobbotsch
commented
Dec 11, 2025

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS
Need to revert async test enabling before merging, but it should be ready for review.
Also cc @VSadov@jkotas for the VM parts. To avoid changing JIT32 GC info I changed GetSizeOfFrameHeaderForEnC to make the determination if the two contexts are present based on MethodDesc::RequiresAsyncContextSaveAndRestore. But we could also change the JIT32 GC info if that is preferred. Thoughts?
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
we could also change the JIT32 GC info if that is preferred. Thoughts?
I think it is ok to take this shortcut - if it is just for EnC on x86.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
December 11, 2025 13:43
CopilotAI
review requested due to automatic review settings
December 11, 2025 13:43
CopilotAI
reviewed
Dec 11, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Pull request overview
This pull request adds support for async contexts (ExecutionContext and SynchronizationContext) in OSR (On Stack Replacement) and EnC (Edit and Continue) scenarios. The JIT now stores these contexts in the stack frame and ensures they are properly preserved when transitioning between tiered compilation levels.
Key Changes:
  • Async context locals are now allocated in the EnC frame header alongside other preserved state like the monitor acquired flag
  • OSR methods reuse the async context values from the tier0 frame instead of recapturing them
  • Frame layout calculations updated across all architectures to account for the two new async context slots
Reviewed changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.
Show a summary per file
FileDescription
src/tests/async/execution-context/execution-context.csAdds test for verifying async context restoration across OSR transitions
src/coreclr/vm/gc_unwind_x86.inlUpdates x86 EnC frame header size calculation to include async context slots
src/coreclr/vm/eetwain.cppUpdates EnC frame header size calls to pass MethodDesc parameter
src/coreclr/jit/lclvars.cppAdds lvaAllocAsyncContexts helper and integrates async context allocation into frame layout; handles OSR locals properly
src/coreclr/jit/flowgraph.cppMarks monitor acquired local as OSR local when in OSR mode
src/coreclr/jit/compiler.hDeclares new lvaAllocAsyncContexts helper method
src/coreclr/jit/compiler.cppRecords async context offsets in patchpoint info for OSR; updates OSR local validation
src/coreclr/jit/codegenxarch.cppUpdates x64 EnC preserved area size to include async contexts
src/coreclr/jit/codegenriscv64.cppUpdates RISC-V64 frame calculations for async contexts
src/coreclr/jit/codegenloongarch64.cppUpdates LoongArch64 frame calculations and EnC preserved area for async contexts
src/coreclr/jit/codegencommon.cppDisables contiguous GC pointer tracking when async contexts are present
src/coreclr/jit/codegenarmarch.cppUpdates ARM/ARM64 EnC preserved area size for async contexts
src/coreclr/jit/codegenarm64.cppUpdates ARM64 funclet frame size calculations for async contexts
src/coreclr/jit/codegenarm.cppUpdates ARM32 funclet frame size calculations for async contexts
src/coreclr/jit/async.cppSkips context capture call for OSR methods (already done in tier0)
src/coreclr/inc/patchpointinfo.hAdds async context offset fields and accessor methods to PatchpointInfo structure
src/coreclr/inc/jiteeversionguid.hUpdates JIT-EE interface version GUID
docs/design/coreclr/botr/clr-abi.mdDocuments async context preservation requirements for EnC
Comment threadsrc/coreclr/vm/gc_unwind_x86.inl
Outdated

Comment threadsrc/coreclr/jit/lclvars.cpp
Outdated

Comment threadsrc/tests/async/execution-context/execution-context.cs
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 11, 2025

Open

3 tasks
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
The VM changes LGTM
AndyAyersMS
AndyAyersMS
approved these changes
Dec 12, 2025
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

JIT changes look good.
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 2, 2026

Open

3 tasks
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 6, 2026

Closed

@jakobbotsch
jakobbotsch
merged commit 0bdd768
into
dotnet:mainJan 6, 2026

115 of 118 checks passed

@jakobbotsch
jakobbotsch
deleted the

fix-osr-enc-async-state

branch
January 6, 2026 16:18

This was referenced Jan 9, 2026
 Closed

 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Feb 6, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@jkotasjkotasAwaiting requested review from jkotas
@VSadovVSadovAwaiting requested review from VSadov

Assignees

@jakobbotschjakobbotsch

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMIruntime-async

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@jakobbotsch@akoeplinger@jkotas@AndyAyersMS

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: Support async contexts for OSR/EnC - #121672
Merged
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Jan 6, 2026
Merged
JIT: Support async contexts for OSR/EnC#121672
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Nov 15, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Now that async contexts are stored around the body of async methods we need to take special care that these pieces of state get restored on OSR and EnC transitions.
@jakobbotsch
JIT: Support async contexts for OSR/EnC
aed98e1
Now that async contexts are stored around the body of async methods we
need to take special case that these pieces of state get restored on OSR
and EnC transitions.
@github-actionsgithub-actionsBot
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Nov 15, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Nov 15, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch

See info in area-owners.md if you want to be subscribed.
jakobbotsch
jakobbotsch
commented
Nov 15, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/flowgraph.cpp

This was referenced Nov 16, 2025

Open


Open


Closed

@jakobbotsch
jakobbotsch
commented
Nov 16, 2025

Copy link


Copy Markdown

MemberAuthor
Still have various x86 functions like GetLocallocSPOffset that probably need to be taught about the two new specially allocated context variables.
CopilotAI
mentioned this pull request
Nov 24, 2025
 Merged

@akoeplinger
akoeplinger
commented
Nov 24, 2025

Copy link


Copy Markdown

Member
Sorry, for some reason Copilot added a Fixes message for this PR in #121923 🤦
jakobbotsch
jakobbotsch
commented
Dec 10, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/lclvars.cpp
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 10, 2025

Open

@jakobbotsch
jakobbotsch
commented
Dec 11, 2025

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS
Need to revert async test enabling before merging, but it should be ready for review.
Also cc @VSadov@jkotas for the VM parts. To avoid changing JIT32 GC info I changed GetSizeOfFrameHeaderForEnC to make the determination if the two contexts are present based on MethodDesc::RequiresAsyncContextSaveAndRestore. But we could also change the JIT32 GC info if that is preferred. Thoughts?
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
we could also change the JIT32 GC info if that is preferred. Thoughts?
I think it is ok to take this shortcut - if it is just for EnC on x86.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
December 11, 2025 13:43
CopilotAI
review requested due to automatic review settings
December 11, 2025 13:43
CopilotAI
reviewed
Dec 11, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Pull request overview
This pull request adds support for async contexts (ExecutionContext and SynchronizationContext) in OSR (On Stack Replacement) and EnC (Edit and Continue) scenarios. The JIT now stores these contexts in the stack frame and ensures they are properly preserved when transitioning between tiered compilation levels.
Key Changes:
  • Async context locals are now allocated in the EnC frame header alongside other preserved state like the monitor acquired flag
  • OSR methods reuse the async context values from the tier0 frame instead of recapturing them
  • Frame layout calculations updated across all architectures to account for the two new async context slots
Reviewed changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.
Show a summary per file
FileDescription
src/tests/async/execution-context/execution-context.csAdds test for verifying async context restoration across OSR transitions
src/coreclr/vm/gc_unwind_x86.inlUpdates x86 EnC frame header size calculation to include async context slots
src/coreclr/vm/eetwain.cppUpdates EnC frame header size calls to pass MethodDesc parameter
src/coreclr/jit/lclvars.cppAdds lvaAllocAsyncContexts helper and integrates async context allocation into frame layout; handles OSR locals properly
src/coreclr/jit/flowgraph.cppMarks monitor acquired local as OSR local when in OSR mode
src/coreclr/jit/compiler.hDeclares new lvaAllocAsyncContexts helper method
src/coreclr/jit/compiler.cppRecords async context offsets in patchpoint info for OSR; updates OSR local validation
src/coreclr/jit/codegenxarch.cppUpdates x64 EnC preserved area size to include async contexts
src/coreclr/jit/codegenriscv64.cppUpdates RISC-V64 frame calculations for async contexts
src/coreclr/jit/codegenloongarch64.cppUpdates LoongArch64 frame calculations and EnC preserved area for async contexts
src/coreclr/jit/codegencommon.cppDisables contiguous GC pointer tracking when async contexts are present
src/coreclr/jit/codegenarmarch.cppUpdates ARM/ARM64 EnC preserved area size for async contexts
src/coreclr/jit/codegenarm64.cppUpdates ARM64 funclet frame size calculations for async contexts
src/coreclr/jit/codegenarm.cppUpdates ARM32 funclet frame size calculations for async contexts
src/coreclr/jit/async.cppSkips context capture call for OSR methods (already done in tier0)
src/coreclr/inc/patchpointinfo.hAdds async context offset fields and accessor methods to PatchpointInfo structure
src/coreclr/inc/jiteeversionguid.hUpdates JIT-EE interface version GUID
docs/design/coreclr/botr/clr-abi.mdDocuments async context preservation requirements for EnC
Comment threadsrc/coreclr/vm/gc_unwind_x86.inl
Outdated

Comment threadsrc/coreclr/jit/lclvars.cpp
Outdated

Comment threadsrc/tests/async/execution-context/execution-context.cs
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 11, 2025

Open

3 tasks
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
The VM changes LGTM
AndyAyersMS
AndyAyersMS
approved these changes
Dec 12, 2025
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

JIT changes look good.
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 2, 2026

Open

3 tasks
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 6, 2026

Closed

@jakobbotsch
jakobbotsch
merged commit 0bdd768
into
dotnet:mainJan 6, 2026

115 of 118 checks passed

@jakobbotsch
jakobbotsch
deleted the

fix-osr-enc-async-state

branch
January 6, 2026 16:18

This was referenced Jan 9, 2026
 Closed

 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Feb 6, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@jkotasjkotasAwaiting requested review from jkotas
@VSadovVSadovAwaiting requested review from VSadov

Assignees

@jakobbotschjakobbotsch

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMIruntime-async

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@jakobbotsch@akoeplinger@jkotas@AndyAyersMS

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: Support async contexts for OSR/EnC - #121672
Merged
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Jan 6, 2026
Merged
JIT: Support async contexts for OSR/EnC#121672
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Nov 15, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Now that async contexts are stored around the body of async methods we need to take special care that these pieces of state get restored on OSR and EnC transitions.
@jakobbotsch
JIT: Support async contexts for OSR/EnC
aed98e1
Now that async contexts are stored around the body of async methods we
need to take special case that these pieces of state get restored on OSR
and EnC transitions.
@github-actionsgithub-actionsBot
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Nov 15, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Nov 15, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch

See info in area-owners.md if you want to be subscribed.
jakobbotsch
jakobbotsch
commented
Nov 15, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/flowgraph.cpp

This was referenced Nov 16, 2025

Open


Open


Closed

@jakobbotsch
jakobbotsch
commented
Nov 16, 2025

Copy link


Copy Markdown

MemberAuthor
Still have various x86 functions like GetLocallocSPOffset that probably need to be taught about the two new specially allocated context variables.
CopilotAI
mentioned this pull request
Nov 24, 2025
 Merged

@akoeplinger
akoeplinger
commented
Nov 24, 2025

Copy link


Copy Markdown

Member
Sorry, for some reason Copilot added a Fixes message for this PR in #121923 🤦
jakobbotsch
jakobbotsch
commented
Dec 10, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/lclvars.cpp
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 10, 2025

Open

@jakobbotsch
jakobbotsch
commented
Dec 11, 2025

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS
Need to revert async test enabling before merging, but it should be ready for review.
Also cc @VSadov@jkotas for the VM parts. To avoid changing JIT32 GC info I changed GetSizeOfFrameHeaderForEnC to make the determination if the two contexts are present based on MethodDesc::RequiresAsyncContextSaveAndRestore. But we could also change the JIT32 GC info if that is preferred. Thoughts?
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
we could also change the JIT32 GC info if that is preferred. Thoughts?
I think it is ok to take this shortcut - if it is just for EnC on x86.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
December 11, 2025 13:43
CopilotAI
review requested due to automatic review settings
December 11, 2025 13:43
CopilotAI
reviewed
Dec 11, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Pull request overview
This pull request adds support for async contexts (ExecutionContext and SynchronizationContext) in OSR (On Stack Replacement) and EnC (Edit and Continue) scenarios. The JIT now stores these contexts in the stack frame and ensures they are properly preserved when transitioning between tiered compilation levels.
Key Changes:
  • Async context locals are now allocated in the EnC frame header alongside other preserved state like the monitor acquired flag
  • OSR methods reuse the async context values from the tier0 frame instead of recapturing them
  • Frame layout calculations updated across all architectures to account for the two new async context slots
Reviewed changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.
Show a summary per file
FileDescription
src/tests/async/execution-context/execution-context.csAdds test for verifying async context restoration across OSR transitions
src/coreclr/vm/gc_unwind_x86.inlUpdates x86 EnC frame header size calculation to include async context slots
src/coreclr/vm/eetwain.cppUpdates EnC frame header size calls to pass MethodDesc parameter
src/coreclr/jit/lclvars.cppAdds lvaAllocAsyncContexts helper and integrates async context allocation into frame layout; handles OSR locals properly
src/coreclr/jit/flowgraph.cppMarks monitor acquired local as OSR local when in OSR mode
src/coreclr/jit/compiler.hDeclares new lvaAllocAsyncContexts helper method
src/coreclr/jit/compiler.cppRecords async context offsets in patchpoint info for OSR; updates OSR local validation
src/coreclr/jit/codegenxarch.cppUpdates x64 EnC preserved area size to include async contexts
src/coreclr/jit/codegenriscv64.cppUpdates RISC-V64 frame calculations for async contexts
src/coreclr/jit/codegenloongarch64.cppUpdates LoongArch64 frame calculations and EnC preserved area for async contexts
src/coreclr/jit/codegencommon.cppDisables contiguous GC pointer tracking when async contexts are present
src/coreclr/jit/codegenarmarch.cppUpdates ARM/ARM64 EnC preserved area size for async contexts
src/coreclr/jit/codegenarm64.cppUpdates ARM64 funclet frame size calculations for async contexts
src/coreclr/jit/codegenarm.cppUpdates ARM32 funclet frame size calculations for async contexts
src/coreclr/jit/async.cppSkips context capture call for OSR methods (already done in tier0)
src/coreclr/inc/patchpointinfo.hAdds async context offset fields and accessor methods to PatchpointInfo structure
src/coreclr/inc/jiteeversionguid.hUpdates JIT-EE interface version GUID
docs/design/coreclr/botr/clr-abi.mdDocuments async context preservation requirements for EnC
Comment threadsrc/coreclr/vm/gc_unwind_x86.inl
Outdated

Comment threadsrc/coreclr/jit/lclvars.cpp
Outdated

Comment threadsrc/tests/async/execution-context/execution-context.cs
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 11, 2025

Open

3 tasks
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
The VM changes LGTM
AndyAyersMS
AndyAyersMS
approved these changes
Dec 12, 2025
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

JIT changes look good.
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 2, 2026

Open

3 tasks
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 6, 2026

Closed

@jakobbotsch
jakobbotsch
merged commit 0bdd768
into
dotnet:mainJan 6, 2026

115 of 118 checks passed

@jakobbotsch
jakobbotsch
deleted the

fix-osr-enc-async-state

branch
January 6, 2026 16:18

This was referenced Jan 9, 2026
 Closed

 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Feb 6, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@jkotasjkotasAwaiting requested review from jkotas
@VSadovVSadovAwaiting requested review from VSadov

Assignees

@jakobbotschjakobbotsch

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMIruntime-async

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@jakobbotsch@akoeplinger@jkotas@AndyAyersMS

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
JIT: Support async contexts for OSR/EnC - #121672
Merged
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Jan 6, 2026
Merged
JIT: Support async contexts for OSR/EnC#121672
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Nov 15, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Now that async contexts are stored around the body of async methods we need to take special care that these pieces of state get restored on OSR and EnC transitions.
@jakobbotsch
JIT: Support async contexts for OSR/EnC
aed98e1
Now that async contexts are stored around the body of async methods we
need to take special case that these pieces of state get restored on OSR
and EnC transitions.
@github-actionsgithub-actionsBot
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Nov 15, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Nov 15, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch

See info in area-owners.md if you want to be subscribed.
jakobbotsch
jakobbotsch
commented
Nov 15, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/flowgraph.cpp

This was referenced Nov 16, 2025

Open


Open


Closed

@jakobbotsch
jakobbotsch
commented
Nov 16, 2025

Copy link


Copy Markdown

MemberAuthor
Still have various x86 functions like GetLocallocSPOffset that probably need to be taught about the two new specially allocated context variables.
CopilotAI
mentioned this pull request
Nov 24, 2025
 Merged

@akoeplinger
akoeplinger
commented
Nov 24, 2025

Copy link


Copy Markdown

Member
Sorry, for some reason Copilot added a Fixes message for this PR in #121923 🤦
jakobbotsch
jakobbotsch
commented
Dec 10, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/lclvars.cpp
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 10, 2025

Open

@jakobbotsch
jakobbotsch
commented
Dec 11, 2025

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS
Need to revert async test enabling before merging, but it should be ready for review.
Also cc @VSadov@jkotas for the VM parts. To avoid changing JIT32 GC info I changed GetSizeOfFrameHeaderForEnC to make the determination if the two contexts are present based on MethodDesc::RequiresAsyncContextSaveAndRestore. But we could also change the JIT32 GC info if that is preferred. Thoughts?
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
we could also change the JIT32 GC info if that is preferred. Thoughts?
I think it is ok to take this shortcut - if it is just for EnC on x86.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
December 11, 2025 13:43
CopilotAI
review requested due to automatic review settings
December 11, 2025 13:43
CopilotAI
reviewed
Dec 11, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Pull request overview
This pull request adds support for async contexts (ExecutionContext and SynchronizationContext) in OSR (On Stack Replacement) and EnC (Edit and Continue) scenarios. The JIT now stores these contexts in the stack frame and ensures they are properly preserved when transitioning between tiered compilation levels.
Key Changes:
  • Async context locals are now allocated in the EnC frame header alongside other preserved state like the monitor acquired flag
  • OSR methods reuse the async context values from the tier0 frame instead of recapturing them
  • Frame layout calculations updated across all architectures to account for the two new async context slots
Reviewed changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.
Show a summary per file
FileDescription
src/tests/async/execution-context/execution-context.csAdds test for verifying async context restoration across OSR transitions
src/coreclr/vm/gc_unwind_x86.inlUpdates x86 EnC frame header size calculation to include async context slots
src/coreclr/vm/eetwain.cppUpdates EnC frame header size calls to pass MethodDesc parameter
src/coreclr/jit/lclvars.cppAdds lvaAllocAsyncContexts helper and integrates async context allocation into frame layout; handles OSR locals properly
src/coreclr/jit/flowgraph.cppMarks monitor acquired local as OSR local when in OSR mode
src/coreclr/jit/compiler.hDeclares new lvaAllocAsyncContexts helper method
src/coreclr/jit/compiler.cppRecords async context offsets in patchpoint info for OSR; updates OSR local validation
src/coreclr/jit/codegenxarch.cppUpdates x64 EnC preserved area size to include async contexts
src/coreclr/jit/codegenriscv64.cppUpdates RISC-V64 frame calculations for async contexts
src/coreclr/jit/codegenloongarch64.cppUpdates LoongArch64 frame calculations and EnC preserved area for async contexts
src/coreclr/jit/codegencommon.cppDisables contiguous GC pointer tracking when async contexts are present
src/coreclr/jit/codegenarmarch.cppUpdates ARM/ARM64 EnC preserved area size for async contexts
src/coreclr/jit/codegenarm64.cppUpdates ARM64 funclet frame size calculations for async contexts
src/coreclr/jit/codegenarm.cppUpdates ARM32 funclet frame size calculations for async contexts
src/coreclr/jit/async.cppSkips context capture call for OSR methods (already done in tier0)
src/coreclr/inc/patchpointinfo.hAdds async context offset fields and accessor methods to PatchpointInfo structure
src/coreclr/inc/jiteeversionguid.hUpdates JIT-EE interface version GUID
docs/design/coreclr/botr/clr-abi.mdDocuments async context preservation requirements for EnC
Comment threadsrc/coreclr/vm/gc_unwind_x86.inl
Outdated

Comment threadsrc/coreclr/jit/lclvars.cpp
Outdated

Comment threadsrc/tests/async/execution-context/execution-context.cs
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 11, 2025

Open

3 tasks
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
The VM changes LGTM
AndyAyersMS
AndyAyersMS
approved these changes
Dec 12, 2025
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

JIT changes look good.
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 2, 2026

Open

3 tasks
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 6, 2026

Closed

@jakobbotsch
jakobbotsch
merged commit 0bdd768
into
dotnet:mainJan 6, 2026

115 of 118 checks passed

@jakobbotsch
jakobbotsch
deleted the

fix-osr-enc-async-state

branch
January 6, 2026 16:18

This was referenced Jan 9, 2026
 Closed

 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Feb 6, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@jkotasjkotasAwaiting requested review from jkotas
@VSadovVSadovAwaiting requested review from VSadov

Assignees

@jakobbotschjakobbotsch

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMIruntime-async

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@jakobbotsch@akoeplinger@jkotas@AndyAyersMS

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: Support async contexts for OSR/EnC - #121672
Merged
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Jan 6, 2026
Merged
JIT: Support async contexts for OSR/EnC#121672
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Nov 15, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Now that async contexts are stored around the body of async methods we need to take special care that these pieces of state get restored on OSR and EnC transitions.
@jakobbotsch
JIT: Support async contexts for OSR/EnC
aed98e1
Now that async contexts are stored around the body of async methods we
need to take special case that these pieces of state get restored on OSR
and EnC transitions.
@github-actionsgithub-actionsBot
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Nov 15, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Nov 15, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch

See info in area-owners.md if you want to be subscribed.
jakobbotsch
jakobbotsch
commented
Nov 15, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/flowgraph.cpp

This was referenced Nov 16, 2025

Open


Open


Closed

@jakobbotsch
jakobbotsch
commented
Nov 16, 2025

Copy link


Copy Markdown

MemberAuthor
Still have various x86 functions like GetLocallocSPOffset that probably need to be taught about the two new specially allocated context variables.
CopilotAI
mentioned this pull request
Nov 24, 2025
 Merged

@akoeplinger
akoeplinger
commented
Nov 24, 2025

Copy link


Copy Markdown

Member
Sorry, for some reason Copilot added a Fixes message for this PR in #121923 🤦
jakobbotsch
jakobbotsch
commented
Dec 10, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/lclvars.cpp
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 10, 2025

Open

@jakobbotsch
jakobbotsch
commented
Dec 11, 2025

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS
Need to revert async test enabling before merging, but it should be ready for review.
Also cc @VSadov@jkotas for the VM parts. To avoid changing JIT32 GC info I changed GetSizeOfFrameHeaderForEnC to make the determination if the two contexts are present based on MethodDesc::RequiresAsyncContextSaveAndRestore. But we could also change the JIT32 GC info if that is preferred. Thoughts?
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
we could also change the JIT32 GC info if that is preferred. Thoughts?
I think it is ok to take this shortcut - if it is just for EnC on x86.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
December 11, 2025 13:43
CopilotAI
review requested due to automatic review settings
December 11, 2025 13:43
CopilotAI
reviewed
Dec 11, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Pull request overview
This pull request adds support for async contexts (ExecutionContext and SynchronizationContext) in OSR (On Stack Replacement) and EnC (Edit and Continue) scenarios. The JIT now stores these contexts in the stack frame and ensures they are properly preserved when transitioning between tiered compilation levels.
Key Changes:
  • Async context locals are now allocated in the EnC frame header alongside other preserved state like the monitor acquired flag
  • OSR methods reuse the async context values from the tier0 frame instead of recapturing them
  • Frame layout calculations updated across all architectures to account for the two new async context slots
Reviewed changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.
Show a summary per file
FileDescription
src/tests/async/execution-context/execution-context.csAdds test for verifying async context restoration across OSR transitions
src/coreclr/vm/gc_unwind_x86.inlUpdates x86 EnC frame header size calculation to include async context slots
src/coreclr/vm/eetwain.cppUpdates EnC frame header size calls to pass MethodDesc parameter
src/coreclr/jit/lclvars.cppAdds lvaAllocAsyncContexts helper and integrates async context allocation into frame layout; handles OSR locals properly
src/coreclr/jit/flowgraph.cppMarks monitor acquired local as OSR local when in OSR mode
src/coreclr/jit/compiler.hDeclares new lvaAllocAsyncContexts helper method
src/coreclr/jit/compiler.cppRecords async context offsets in patchpoint info for OSR; updates OSR local validation
src/coreclr/jit/codegenxarch.cppUpdates x64 EnC preserved area size to include async contexts
src/coreclr/jit/codegenriscv64.cppUpdates RISC-V64 frame calculations for async contexts
src/coreclr/jit/codegenloongarch64.cppUpdates LoongArch64 frame calculations and EnC preserved area for async contexts
src/coreclr/jit/codegencommon.cppDisables contiguous GC pointer tracking when async contexts are present
src/coreclr/jit/codegenarmarch.cppUpdates ARM/ARM64 EnC preserved area size for async contexts
src/coreclr/jit/codegenarm64.cppUpdates ARM64 funclet frame size calculations for async contexts
src/coreclr/jit/codegenarm.cppUpdates ARM32 funclet frame size calculations for async contexts
src/coreclr/jit/async.cppSkips context capture call for OSR methods (already done in tier0)
src/coreclr/inc/patchpointinfo.hAdds async context offset fields and accessor methods to PatchpointInfo structure
src/coreclr/inc/jiteeversionguid.hUpdates JIT-EE interface version GUID
docs/design/coreclr/botr/clr-abi.mdDocuments async context preservation requirements for EnC
Comment threadsrc/coreclr/vm/gc_unwind_x86.inl
Outdated

Comment threadsrc/coreclr/jit/lclvars.cpp
Outdated

Comment threadsrc/tests/async/execution-context/execution-context.cs
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 11, 2025

Open

3 tasks
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
The VM changes LGTM
AndyAyersMS
AndyAyersMS
approved these changes
Dec 12, 2025
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

JIT changes look good.
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 2, 2026

Open

3 tasks
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 6, 2026

Closed

@jakobbotsch
jakobbotsch
merged commit 0bdd768
into
dotnet:mainJan 6, 2026

115 of 118 checks passed

@jakobbotsch
jakobbotsch
deleted the

fix-osr-enc-async-state

branch
January 6, 2026 16:18

This was referenced Jan 9, 2026
 Closed

 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Feb 6, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@jkotasjkotasAwaiting requested review from jkotas
@VSadovVSadovAwaiting requested review from VSadov

Assignees

@jakobbotschjakobbotsch

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMIruntime-async

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@jakobbotsch@akoeplinger@jkotas@AndyAyersMS

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: Support async contexts for OSR/EnC - #121672
Merged
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Jan 6, 2026
Merged
JIT: Support async contexts for OSR/EnC#121672
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Nov 15, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Now that async contexts are stored around the body of async methods we need to take special care that these pieces of state get restored on OSR and EnC transitions.
@jakobbotsch
JIT: Support async contexts for OSR/EnC
aed98e1
Now that async contexts are stored around the body of async methods we
need to take special case that these pieces of state get restored on OSR
and EnC transitions.
@github-actionsgithub-actionsBot
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Nov 15, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Nov 15, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch

See info in area-owners.md if you want to be subscribed.
jakobbotsch
jakobbotsch
commented
Nov 15, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/flowgraph.cpp

This was referenced Nov 16, 2025

Open


Open


Closed

@jakobbotsch
jakobbotsch
commented
Nov 16, 2025

Copy link


Copy Markdown

MemberAuthor
Still have various x86 functions like GetLocallocSPOffset that probably need to be taught about the two new specially allocated context variables.
CopilotAI
mentioned this pull request
Nov 24, 2025
 Merged

@akoeplinger
akoeplinger
commented
Nov 24, 2025

Copy link


Copy Markdown

Member
Sorry, for some reason Copilot added a Fixes message for this PR in #121923 🤦
jakobbotsch
jakobbotsch
commented
Dec 10, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/lclvars.cpp
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 10, 2025

Open

@jakobbotsch
jakobbotsch
commented
Dec 11, 2025

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS
Need to revert async test enabling before merging, but it should be ready for review.
Also cc @VSadov@jkotas for the VM parts. To avoid changing JIT32 GC info I changed GetSizeOfFrameHeaderForEnC to make the determination if the two contexts are present based on MethodDesc::RequiresAsyncContextSaveAndRestore. But we could also change the JIT32 GC info if that is preferred. Thoughts?
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
we could also change the JIT32 GC info if that is preferred. Thoughts?
I think it is ok to take this shortcut - if it is just for EnC on x86.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
December 11, 2025 13:43
CopilotAI
review requested due to automatic review settings
December 11, 2025 13:43
CopilotAI
reviewed
Dec 11, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Pull request overview
This pull request adds support for async contexts (ExecutionContext and SynchronizationContext) in OSR (On Stack Replacement) and EnC (Edit and Continue) scenarios. The JIT now stores these contexts in the stack frame and ensures they are properly preserved when transitioning between tiered compilation levels.
Key Changes:
  • Async context locals are now allocated in the EnC frame header alongside other preserved state like the monitor acquired flag
  • OSR methods reuse the async context values from the tier0 frame instead of recapturing them
  • Frame layout calculations updated across all architectures to account for the two new async context slots
Reviewed changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.
Show a summary per file
FileDescription
src/tests/async/execution-context/execution-context.csAdds test for verifying async context restoration across OSR transitions
src/coreclr/vm/gc_unwind_x86.inlUpdates x86 EnC frame header size calculation to include async context slots
src/coreclr/vm/eetwain.cppUpdates EnC frame header size calls to pass MethodDesc parameter
src/coreclr/jit/lclvars.cppAdds lvaAllocAsyncContexts helper and integrates async context allocation into frame layout; handles OSR locals properly
src/coreclr/jit/flowgraph.cppMarks monitor acquired local as OSR local when in OSR mode
src/coreclr/jit/compiler.hDeclares new lvaAllocAsyncContexts helper method
src/coreclr/jit/compiler.cppRecords async context offsets in patchpoint info for OSR; updates OSR local validation
src/coreclr/jit/codegenxarch.cppUpdates x64 EnC preserved area size to include async contexts
src/coreclr/jit/codegenriscv64.cppUpdates RISC-V64 frame calculations for async contexts
src/coreclr/jit/codegenloongarch64.cppUpdates LoongArch64 frame calculations and EnC preserved area for async contexts
src/coreclr/jit/codegencommon.cppDisables contiguous GC pointer tracking when async contexts are present
src/coreclr/jit/codegenarmarch.cppUpdates ARM/ARM64 EnC preserved area size for async contexts
src/coreclr/jit/codegenarm64.cppUpdates ARM64 funclet frame size calculations for async contexts
src/coreclr/jit/codegenarm.cppUpdates ARM32 funclet frame size calculations for async contexts
src/coreclr/jit/async.cppSkips context capture call for OSR methods (already done in tier0)
src/coreclr/inc/patchpointinfo.hAdds async context offset fields and accessor methods to PatchpointInfo structure
src/coreclr/inc/jiteeversionguid.hUpdates JIT-EE interface version GUID
docs/design/coreclr/botr/clr-abi.mdDocuments async context preservation requirements for EnC
Comment threadsrc/coreclr/vm/gc_unwind_x86.inl
Outdated

Comment threadsrc/coreclr/jit/lclvars.cpp
Outdated

Comment threadsrc/tests/async/execution-context/execution-context.cs
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 11, 2025

Open

3 tasks
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
The VM changes LGTM
AndyAyersMS
AndyAyersMS
approved these changes
Dec 12, 2025
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

JIT changes look good.
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 2, 2026

Open

3 tasks
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 6, 2026

Closed

@jakobbotsch
jakobbotsch
merged commit 0bdd768
into
dotnet:mainJan 6, 2026

115 of 118 checks passed

@jakobbotsch
jakobbotsch
deleted the

fix-osr-enc-async-state

branch
January 6, 2026 16:18

This was referenced Jan 9, 2026
 Closed

 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Feb 6, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@jkotasjkotasAwaiting requested review from jkotas
@VSadovVSadovAwaiting requested review from VSadov

Assignees

@jakobbotschjakobbotsch

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMIruntime-async

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@jakobbotsch@akoeplinger@jkotas@AndyAyersMS

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
JIT: Support async contexts for OSR/EnC - #121672
Merged
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Jan 6, 2026
Merged
JIT: Support async contexts for OSR/EnC#121672
jakobbotsch merged 13 commits into
dotnet:mainfrom 
jakobbotsch:fix-osr-enc-async-state
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Nov 15, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Now that async contexts are stored around the body of async methods we need to take special care that these pieces of state get restored on OSR and EnC transitions.
@jakobbotsch
JIT: Support async contexts for OSR/EnC
aed98e1
Now that async contexts are stored around the body of async methods we
need to take special case that these pieces of state get restored on OSR
and EnC transitions.
@github-actionsgithub-actionsBot
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Nov 15, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Nov 15, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch

See info in area-owners.md if you want to be subscribed.
jakobbotsch
jakobbotsch
commented
Nov 15, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/flowgraph.cpp

This was referenced Nov 16, 2025

Open


Open


Closed

@jakobbotsch
jakobbotsch
commented
Nov 16, 2025

Copy link


Copy Markdown

MemberAuthor
Still have various x86 functions like GetLocallocSPOffset that probably need to be taught about the two new specially allocated context variables.
CopilotAI
mentioned this pull request
Nov 24, 2025
 Merged

@akoeplinger
akoeplinger
commented
Nov 24, 2025

Copy link


Copy Markdown

Member
Sorry, for some reason Copilot added a Fixes message for this PR in #121923 🤦
jakobbotsch
jakobbotsch
commented
Dec 10, 2025
View reviewed changes
Comment threadsrc/coreclr/jit/lclvars.cpp
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 10, 2025

Open

@jakobbotsch
jakobbotsch
commented
Dec 11, 2025

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS
Need to revert async test enabling before merging, but it should be ready for review.
Also cc @VSadov@jkotas for the VM parts. To avoid changing JIT32 GC info I changed GetSizeOfFrameHeaderForEnC to make the determination if the two contexts are present based on MethodDesc::RequiresAsyncContextSaveAndRestore. But we could also change the JIT32 GC info if that is preferred. Thoughts?
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
we could also change the JIT32 GC info if that is preferred. Thoughts?
I think it is ok to take this shortcut - if it is just for EnC on x86.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
December 11, 2025 13:43
CopilotAI
review requested due to automatic review settings
December 11, 2025 13:43
CopilotAI
reviewed
Dec 11, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Pull request overview
This pull request adds support for async contexts (ExecutionContext and SynchronizationContext) in OSR (On Stack Replacement) and EnC (Edit and Continue) scenarios. The JIT now stores these contexts in the stack frame and ensures they are properly preserved when transitioning between tiered compilation levels.
Key Changes:
  • Async context locals are now allocated in the EnC frame header alongside other preserved state like the monitor acquired flag
  • OSR methods reuse the async context values from the tier0 frame instead of recapturing them
  • Frame layout calculations updated across all architectures to account for the two new async context slots
Reviewed changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.
Show a summary per file
FileDescription
src/tests/async/execution-context/execution-context.csAdds test for verifying async context restoration across OSR transitions
src/coreclr/vm/gc_unwind_x86.inlUpdates x86 EnC frame header size calculation to include async context slots
src/coreclr/vm/eetwain.cppUpdates EnC frame header size calls to pass MethodDesc parameter
src/coreclr/jit/lclvars.cppAdds lvaAllocAsyncContexts helper and integrates async context allocation into frame layout; handles OSR locals properly
src/coreclr/jit/flowgraph.cppMarks monitor acquired local as OSR local when in OSR mode
src/coreclr/jit/compiler.hDeclares new lvaAllocAsyncContexts helper method
src/coreclr/jit/compiler.cppRecords async context offsets in patchpoint info for OSR; updates OSR local validation
src/coreclr/jit/codegenxarch.cppUpdates x64 EnC preserved area size to include async contexts
src/coreclr/jit/codegenriscv64.cppUpdates RISC-V64 frame calculations for async contexts
src/coreclr/jit/codegenloongarch64.cppUpdates LoongArch64 frame calculations and EnC preserved area for async contexts
src/coreclr/jit/codegencommon.cppDisables contiguous GC pointer tracking when async contexts are present
src/coreclr/jit/codegenarmarch.cppUpdates ARM/ARM64 EnC preserved area size for async contexts
src/coreclr/jit/codegenarm64.cppUpdates ARM64 funclet frame size calculations for async contexts
src/coreclr/jit/codegenarm.cppUpdates ARM32 funclet frame size calculations for async contexts
src/coreclr/jit/async.cppSkips context capture call for OSR methods (already done in tier0)
src/coreclr/inc/patchpointinfo.hAdds async context offset fields and accessor methods to PatchpointInfo structure
src/coreclr/inc/jiteeversionguid.hUpdates JIT-EE interface version GUID
docs/design/coreclr/botr/clr-abi.mdDocuments async context preservation requirements for EnC
Comment threadsrc/coreclr/vm/gc_unwind_x86.inl
Outdated

Comment threadsrc/coreclr/jit/lclvars.cpp
Outdated

Comment threadsrc/tests/async/execution-context/execution-context.cs
@build-analysisbuild-analysisBot
mentioned this pull request
Dec 11, 2025

Open

3 tasks
@jkotas
jkotas
commented
Dec 11, 2025

Copy link


Copy Markdown

Member
The VM changes LGTM
AndyAyersMS
AndyAyersMS
approved these changes
Dec 12, 2025
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

JIT changes look good.
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 2, 2026

Open

3 tasks
@build-analysisbuild-analysisBot
mentioned this pull request
Jan 6, 2026

Closed

@jakobbotsch
jakobbotsch
merged commit 0bdd768
into
dotnet:mainJan 6, 2026

115 of 118 checks passed

@jakobbotsch
jakobbotsch
deleted the

fix-osr-enc-async-state

branch
January 6, 2026 16:18

This was referenced Jan 9, 2026
 Closed

 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Feb 6, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@jkotasjkotasAwaiting requested review from jkotas
@VSadovVSadovAwaiting requested review from VSadov

Assignees

@jakobbotschjakobbotsch

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMIruntime-async

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@jakobbotsch@akoeplinger@jkotas@AndyAyersMS