[Async v2] Implement async method variant handling in AddMethod and UpdateMethod - #125397

Merged
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc
Apr 23, 2026
Merged

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod#125397
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc

Conversation

@tommcdon

Copy link
Copy Markdown
Member

This change implements a TODO item in EEClass::AddMethodDesc to support Runtime Async

@tommcdontommcdon added this to the 11.0.0 milestone Mar 10, 2026
@tommcdontommcdon self-assigned this Mar 10, 2026
CopilotAI review requested due to automatic review settings March 10, 2026 18:34
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

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 PR implements runtime-async method variant support in the Edit-and-Continue (EnC) path by extending EEClass::AddMethodDesc/EEClass::AddMethod to carry async metadata (flags + optional alternate signature) and by updating EnC method update logic to consider async method variants.

Changes:

  • Extend EEClass::AddMethodDesc to accept async flags and an optional async-variant signature, and plumb that into MethodTableBuilder::InitMethodDesc.
  • Add async return-type classification and async-variant creation logic to EEClass::AddMethod.
  • Update EditAndContinueModule::UpdateMethod to also reset the entrypoint for the method’s async counterpart.

Reviewed changes

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

FileDescription
src/coreclr/vm/encee.cppResets entrypoints for async counterparts during EnC method updates.
src/coreclr/vm/class.hExtends AddMethodDesc signature to accept async flags and optional async signature.
src/coreclr/vm/class.cppImplements async return classification and passes async flags/signature into EnC-added MethodDesc creation.

You can also share your feedback on Copilot code review. Take the survey.

Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from 76d4eb1 to 437f9edCompareMarch 20, 2026 20:08
@tommcdon
tommcdon marked this pull request as ready for review March 20, 2026 20:09
CopilotAI review requested due to automatic review settings March 20, 2026 20:09

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

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

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp
tommcdon added a commit to tommcdon/runtime that referenced this pull request Apr 3, 2026
…ejection, generic UpdateMethod comment
- class.cpp:579: Update GC violation comment to acknowledge the
extern-alias edge case as Won't Fix per reviewer feedback
- class.cpp:597: Reject infrastructure async methods (IsMiAsync but
not task-returning) on non-system modules with COR_E_BADIMAGEFORMAT,
mirroring MethodTableBuilder validation
- encee.cpp:388: Add comment explaining that ResetCodeEntryPointForEnC
cascades from thunk to async variant automatically, so generic
UpdateMethod path does not need explicit async variant handling
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 3, 2026 00:50

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated

@noahfalknoahfalk 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.

Looks good 👍 Couple suggestions inline

CopilotAI review requested due to automatic review settings April 4, 2026 23:20

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
CopilotAI review requested due to automatic review settings April 5, 2026 02:41
CopilotAI review requested due to automatic review settings April 17, 2026 01:11
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from ec5469d to fb41135CompareApril 17, 2026 01:11

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

Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.

Instead of lazily creating async variant MethodDescs in
FindOrCreateAssociatedMethodDesc, create them eagerly alongside the
primary thunk in EEClass::AddMethod. The variant signature is computed
once from metadata and then AddMethodDesc (GC_NOTRIGGER) creates both
MethodDescs. For generic types, each existing instantiation gets its
own sig copy from its loader allocator.
This eliminates:
- Lazy creation block in FCAMD (double-check locking, GCX_COOP, lock)
- LoadTypicalMethodDefinition fallback for async variants
- EEClass::AddAsyncVariant helper (no longer needed)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
tommcdonand others added 3 commits April 21, 2026 11:15
Previously AddMethod only created async variants for IsMiAsync methods.
Normal type loading (MethodTableBuilder::EnumerateClassMethods) creates
variants for all task-returning methods regardless of IsMiAsync. This
change aligns EnC with that behavior:
- IsMiAsync: primary is thunk, async variant owns the IL
- Non-IsMiAsync: primary owns IL, async variant is a thunk
Also removes per-instantiation signature copy for generic types since
instantiations cannot have longer lifetime than the definition.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace inline NonGenericTask and GenericTask signature rewriting in
MethodTableBuilder::EnumerateClassMethods with calls to the shared
BuildAsyncVariantSignature function. The ReturnDroppingThunk case
(rare covariant override scenario) remains inline since it has
unique logic not applicable to the EnC path.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
For task-returning methods with async variants, detect when the primary
MethodDesc is a thunk and switch to the async variant that owns the user
code before planting remap breakpoints. This eliminates the duplicated
breakpoint-planting loop that previously handled the async variant
separately.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 21, 2026 16:33

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

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/methodtablebuilder.cpp
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
tommcdonand others added 3 commits April 23, 2026 14:35
Per reviewer feedback, inline the sig construction directly in
EEClass::AddMethod instead of using a shared BuildAsyncVariantSignature
function. Remove the function from method.cpp/method.hpp. Revert all
changes to genmeth.cpp and methodtablebuilder.cpp as no modifications
are needed in the normal type loading path for the EnC feature.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per reviewer feedback, return S_OK instead of falling through when
GetAsyncVariantNoCreate() returns NULL for an async thunk. There is
no user code to plant remap breakpoints on in this case.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Re-add comment explaining the Won't Fix corner cases around the
CONTRACT_VIOLATION(GCViolation) in EnC async variant creation:
type identity may not match well-known types, and the call may
trigger GC even for well-known types.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@tommcdon

Copy link
Copy Markdown
MemberAuthor

/ba-g failures are pre-existing/unrelated

@tommcdon
tommcdon merged commit bd6bb0d into dotnet:mainApr 23, 2026
104 of 109 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tommcdon@noahfalk@jkotas@VSadov
, '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

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod - #125397

Merged
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc
Apr 23, 2026
Merged

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod#125397
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc

Conversation

@tommcdon

Copy link
Copy Markdown
Member

This change implements a TODO item in EEClass::AddMethodDesc to support Runtime Async

@tommcdontommcdon added this to the 11.0.0 milestone Mar 10, 2026
@tommcdontommcdon self-assigned this Mar 10, 2026
CopilotAI review requested due to automatic review settings March 10, 2026 18:34
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

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 PR implements runtime-async method variant support in the Edit-and-Continue (EnC) path by extending EEClass::AddMethodDesc/EEClass::AddMethod to carry async metadata (flags + optional alternate signature) and by updating EnC method update logic to consider async method variants.

Changes:

  • Extend EEClass::AddMethodDesc to accept async flags and an optional async-variant signature, and plumb that into MethodTableBuilder::InitMethodDesc.
  • Add async return-type classification and async-variant creation logic to EEClass::AddMethod.
  • Update EditAndContinueModule::UpdateMethod to also reset the entrypoint for the method’s async counterpart.

Reviewed changes

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

FileDescription
src/coreclr/vm/encee.cppResets entrypoints for async counterparts during EnC method updates.
src/coreclr/vm/class.hExtends AddMethodDesc signature to accept async flags and optional async signature.
src/coreclr/vm/class.cppImplements async return classification and passes async flags/signature into EnC-added MethodDesc creation.

You can also share your feedback on Copilot code review. Take the survey.

Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from 76d4eb1 to 437f9edCompareMarch 20, 2026 20:08
@tommcdon
tommcdon marked this pull request as ready for review March 20, 2026 20:09
CopilotAI review requested due to automatic review settings March 20, 2026 20:09

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

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

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp
tommcdon added a commit to tommcdon/runtime that referenced this pull request Apr 3, 2026
…ejection, generic UpdateMethod comment
- class.cpp:579: Update GC violation comment to acknowledge the
extern-alias edge case as Won't Fix per reviewer feedback
- class.cpp:597: Reject infrastructure async methods (IsMiAsync but
not task-returning) on non-system modules with COR_E_BADIMAGEFORMAT,
mirroring MethodTableBuilder validation
- encee.cpp:388: Add comment explaining that ResetCodeEntryPointForEnC
cascades from thunk to async variant automatically, so generic
UpdateMethod path does not need explicit async variant handling
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 3, 2026 00:50

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated

@noahfalknoahfalk 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.

Looks good 👍 Couple suggestions inline

CopilotAI review requested due to automatic review settings April 4, 2026 23:20

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
CopilotAI review requested due to automatic review settings April 5, 2026 02:41
CopilotAI review requested due to automatic review settings April 17, 2026 01:11
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from ec5469d to fb41135CompareApril 17, 2026 01:11

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

Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.

Instead of lazily creating async variant MethodDescs in
FindOrCreateAssociatedMethodDesc, create them eagerly alongside the
primary thunk in EEClass::AddMethod. The variant signature is computed
once from metadata and then AddMethodDesc (GC_NOTRIGGER) creates both
MethodDescs. For generic types, each existing instantiation gets its
own sig copy from its loader allocator.
This eliminates:
- Lazy creation block in FCAMD (double-check locking, GCX_COOP, lock)
- LoadTypicalMethodDefinition fallback for async variants
- EEClass::AddAsyncVariant helper (no longer needed)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
tommcdonand others added 3 commits April 21, 2026 11:15
Previously AddMethod only created async variants for IsMiAsync methods.
Normal type loading (MethodTableBuilder::EnumerateClassMethods) creates
variants for all task-returning methods regardless of IsMiAsync. This
change aligns EnC with that behavior:
- IsMiAsync: primary is thunk, async variant owns the IL
- Non-IsMiAsync: primary owns IL, async variant is a thunk
Also removes per-instantiation signature copy for generic types since
instantiations cannot have longer lifetime than the definition.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace inline NonGenericTask and GenericTask signature rewriting in
MethodTableBuilder::EnumerateClassMethods with calls to the shared
BuildAsyncVariantSignature function. The ReturnDroppingThunk case
(rare covariant override scenario) remains inline since it has
unique logic not applicable to the EnC path.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
For task-returning methods with async variants, detect when the primary
MethodDesc is a thunk and switch to the async variant that owns the user
code before planting remap breakpoints. This eliminates the duplicated
breakpoint-planting loop that previously handled the async variant
separately.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 21, 2026 16:33

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

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/methodtablebuilder.cpp
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
tommcdonand others added 3 commits April 23, 2026 14:35
Per reviewer feedback, inline the sig construction directly in
EEClass::AddMethod instead of using a shared BuildAsyncVariantSignature
function. Remove the function from method.cpp/method.hpp. Revert all
changes to genmeth.cpp and methodtablebuilder.cpp as no modifications
are needed in the normal type loading path for the EnC feature.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per reviewer feedback, return S_OK instead of falling through when
GetAsyncVariantNoCreate() returns NULL for an async thunk. There is
no user code to plant remap breakpoints on in this case.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Re-add comment explaining the Won't Fix corner cases around the
CONTRACT_VIOLATION(GCViolation) in EnC async variant creation:
type identity may not match well-known types, and the call may
trigger GC even for well-known types.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@tommcdon

Copy link
Copy Markdown
MemberAuthor

/ba-g failures are pre-existing/unrelated

@tommcdon
tommcdon merged commit bd6bb0d into dotnet:mainApr 23, 2026
104 of 109 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tommcdon@noahfalk@jkotas@VSadov
, '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

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod - #125397

Merged
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc
Apr 23, 2026
Merged

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod#125397
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc

Conversation

@tommcdon

Copy link
Copy Markdown
Member

This change implements a TODO item in EEClass::AddMethodDesc to support Runtime Async

@tommcdontommcdon added this to the 11.0.0 milestone Mar 10, 2026
@tommcdontommcdon self-assigned this Mar 10, 2026
CopilotAI review requested due to automatic review settings March 10, 2026 18:34
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

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 PR implements runtime-async method variant support in the Edit-and-Continue (EnC) path by extending EEClass::AddMethodDesc/EEClass::AddMethod to carry async metadata (flags + optional alternate signature) and by updating EnC method update logic to consider async method variants.

Changes:

  • Extend EEClass::AddMethodDesc to accept async flags and an optional async-variant signature, and plumb that into MethodTableBuilder::InitMethodDesc.
  • Add async return-type classification and async-variant creation logic to EEClass::AddMethod.
  • Update EditAndContinueModule::UpdateMethod to also reset the entrypoint for the method’s async counterpart.

Reviewed changes

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

FileDescription
src/coreclr/vm/encee.cppResets entrypoints for async counterparts during EnC method updates.
src/coreclr/vm/class.hExtends AddMethodDesc signature to accept async flags and optional async signature.
src/coreclr/vm/class.cppImplements async return classification and passes async flags/signature into EnC-added MethodDesc creation.

You can also share your feedback on Copilot code review. Take the survey.

Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from 76d4eb1 to 437f9edCompareMarch 20, 2026 20:08
@tommcdon
tommcdon marked this pull request as ready for review March 20, 2026 20:09
CopilotAI review requested due to automatic review settings March 20, 2026 20:09

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

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

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp
tommcdon added a commit to tommcdon/runtime that referenced this pull request Apr 3, 2026
…ejection, generic UpdateMethod comment
- class.cpp:579: Update GC violation comment to acknowledge the
extern-alias edge case as Won't Fix per reviewer feedback
- class.cpp:597: Reject infrastructure async methods (IsMiAsync but
not task-returning) on non-system modules with COR_E_BADIMAGEFORMAT,
mirroring MethodTableBuilder validation
- encee.cpp:388: Add comment explaining that ResetCodeEntryPointForEnC
cascades from thunk to async variant automatically, so generic
UpdateMethod path does not need explicit async variant handling
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 3, 2026 00:50

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated

@noahfalknoahfalk 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.

Looks good 👍 Couple suggestions inline

CopilotAI review requested due to automatic review settings April 4, 2026 23:20

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
CopilotAI review requested due to automatic review settings April 5, 2026 02:41
CopilotAI review requested due to automatic review settings April 17, 2026 01:11
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from ec5469d to fb41135CompareApril 17, 2026 01:11

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

Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.

Instead of lazily creating async variant MethodDescs in
FindOrCreateAssociatedMethodDesc, create them eagerly alongside the
primary thunk in EEClass::AddMethod. The variant signature is computed
once from metadata and then AddMethodDesc (GC_NOTRIGGER) creates both
MethodDescs. For generic types, each existing instantiation gets its
own sig copy from its loader allocator.
This eliminates:
- Lazy creation block in FCAMD (double-check locking, GCX_COOP, lock)
- LoadTypicalMethodDefinition fallback for async variants
- EEClass::AddAsyncVariant helper (no longer needed)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
tommcdonand others added 3 commits April 21, 2026 11:15
Previously AddMethod only created async variants for IsMiAsync methods.
Normal type loading (MethodTableBuilder::EnumerateClassMethods) creates
variants for all task-returning methods regardless of IsMiAsync. This
change aligns EnC with that behavior:
- IsMiAsync: primary is thunk, async variant owns the IL
- Non-IsMiAsync: primary owns IL, async variant is a thunk
Also removes per-instantiation signature copy for generic types since
instantiations cannot have longer lifetime than the definition.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace inline NonGenericTask and GenericTask signature rewriting in
MethodTableBuilder::EnumerateClassMethods with calls to the shared
BuildAsyncVariantSignature function. The ReturnDroppingThunk case
(rare covariant override scenario) remains inline since it has
unique logic not applicable to the EnC path.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
For task-returning methods with async variants, detect when the primary
MethodDesc is a thunk and switch to the async variant that owns the user
code before planting remap breakpoints. This eliminates the duplicated
breakpoint-planting loop that previously handled the async variant
separately.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 21, 2026 16:33

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

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/methodtablebuilder.cpp
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
tommcdonand others added 3 commits April 23, 2026 14:35
Per reviewer feedback, inline the sig construction directly in
EEClass::AddMethod instead of using a shared BuildAsyncVariantSignature
function. Remove the function from method.cpp/method.hpp. Revert all
changes to genmeth.cpp and methodtablebuilder.cpp as no modifications
are needed in the normal type loading path for the EnC feature.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per reviewer feedback, return S_OK instead of falling through when
GetAsyncVariantNoCreate() returns NULL for an async thunk. There is
no user code to plant remap breakpoints on in this case.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Re-add comment explaining the Won't Fix corner cases around the
CONTRACT_VIOLATION(GCViolation) in EnC async variant creation:
type identity may not match well-known types, and the call may
trigger GC even for well-known types.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@tommcdon

Copy link
Copy Markdown
MemberAuthor

/ba-g failures are pre-existing/unrelated

@tommcdon
tommcdon merged commit bd6bb0d into dotnet:mainApr 23, 2026
104 of 109 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tommcdon@noahfalk@jkotas@VSadov
, '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

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod - #125397

Merged
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc
Apr 23, 2026
Merged

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod#125397
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc

Conversation

@tommcdon

Copy link
Copy Markdown
Member

This change implements a TODO item in EEClass::AddMethodDesc to support Runtime Async

@tommcdontommcdon added this to the 11.0.0 milestone Mar 10, 2026
@tommcdontommcdon self-assigned this Mar 10, 2026
CopilotAI review requested due to automatic review settings March 10, 2026 18:34
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

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 PR implements runtime-async method variant support in the Edit-and-Continue (EnC) path by extending EEClass::AddMethodDesc/EEClass::AddMethod to carry async metadata (flags + optional alternate signature) and by updating EnC method update logic to consider async method variants.

Changes:

  • Extend EEClass::AddMethodDesc to accept async flags and an optional async-variant signature, and plumb that into MethodTableBuilder::InitMethodDesc.
  • Add async return-type classification and async-variant creation logic to EEClass::AddMethod.
  • Update EditAndContinueModule::UpdateMethod to also reset the entrypoint for the method’s async counterpart.

Reviewed changes

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

FileDescription
src/coreclr/vm/encee.cppResets entrypoints for async counterparts during EnC method updates.
src/coreclr/vm/class.hExtends AddMethodDesc signature to accept async flags and optional async signature.
src/coreclr/vm/class.cppImplements async return classification and passes async flags/signature into EnC-added MethodDesc creation.

You can also share your feedback on Copilot code review. Take the survey.

Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from 76d4eb1 to 437f9edCompareMarch 20, 2026 20:08
@tommcdon
tommcdon marked this pull request as ready for review March 20, 2026 20:09
CopilotAI review requested due to automatic review settings March 20, 2026 20:09

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

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

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp
tommcdon added a commit to tommcdon/runtime that referenced this pull request Apr 3, 2026
…ejection, generic UpdateMethod comment
- class.cpp:579: Update GC violation comment to acknowledge the
extern-alias edge case as Won't Fix per reviewer feedback
- class.cpp:597: Reject infrastructure async methods (IsMiAsync but
not task-returning) on non-system modules with COR_E_BADIMAGEFORMAT,
mirroring MethodTableBuilder validation
- encee.cpp:388: Add comment explaining that ResetCodeEntryPointForEnC
cascades from thunk to async variant automatically, so generic
UpdateMethod path does not need explicit async variant handling
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 3, 2026 00:50

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated

@noahfalknoahfalk 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.

Looks good 👍 Couple suggestions inline

CopilotAI review requested due to automatic review settings April 4, 2026 23:20

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
CopilotAI review requested due to automatic review settings April 5, 2026 02:41
CopilotAI review requested due to automatic review settings April 17, 2026 01:11
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from ec5469d to fb41135CompareApril 17, 2026 01:11

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

Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.

Instead of lazily creating async variant MethodDescs in
FindOrCreateAssociatedMethodDesc, create them eagerly alongside the
primary thunk in EEClass::AddMethod. The variant signature is computed
once from metadata and then AddMethodDesc (GC_NOTRIGGER) creates both
MethodDescs. For generic types, each existing instantiation gets its
own sig copy from its loader allocator.
This eliminates:
- Lazy creation block in FCAMD (double-check locking, GCX_COOP, lock)
- LoadTypicalMethodDefinition fallback for async variants
- EEClass::AddAsyncVariant helper (no longer needed)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
tommcdonand others added 3 commits April 21, 2026 11:15
Previously AddMethod only created async variants for IsMiAsync methods.
Normal type loading (MethodTableBuilder::EnumerateClassMethods) creates
variants for all task-returning methods regardless of IsMiAsync. This
change aligns EnC with that behavior:
- IsMiAsync: primary is thunk, async variant owns the IL
- Non-IsMiAsync: primary owns IL, async variant is a thunk
Also removes per-instantiation signature copy for generic types since
instantiations cannot have longer lifetime than the definition.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace inline NonGenericTask and GenericTask signature rewriting in
MethodTableBuilder::EnumerateClassMethods with calls to the shared
BuildAsyncVariantSignature function. The ReturnDroppingThunk case
(rare covariant override scenario) remains inline since it has
unique logic not applicable to the EnC path.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
For task-returning methods with async variants, detect when the primary
MethodDesc is a thunk and switch to the async variant that owns the user
code before planting remap breakpoints. This eliminates the duplicated
breakpoint-planting loop that previously handled the async variant
separately.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 21, 2026 16:33

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

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/methodtablebuilder.cpp
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
tommcdonand others added 3 commits April 23, 2026 14:35
Per reviewer feedback, inline the sig construction directly in
EEClass::AddMethod instead of using a shared BuildAsyncVariantSignature
function. Remove the function from method.cpp/method.hpp. Revert all
changes to genmeth.cpp and methodtablebuilder.cpp as no modifications
are needed in the normal type loading path for the EnC feature.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per reviewer feedback, return S_OK instead of falling through when
GetAsyncVariantNoCreate() returns NULL for an async thunk. There is
no user code to plant remap breakpoints on in this case.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Re-add comment explaining the Won't Fix corner cases around the
CONTRACT_VIOLATION(GCViolation) in EnC async variant creation:
type identity may not match well-known types, and the call may
trigger GC even for well-known types.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@tommcdon

Copy link
Copy Markdown
MemberAuthor

/ba-g failures are pre-existing/unrelated

@tommcdon
tommcdon merged commit bd6bb0d into dotnet:mainApr 23, 2026
104 of 109 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tommcdon@noahfalk@jkotas@VSadov
, '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

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod - #125397

Merged
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc
Apr 23, 2026
Merged

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod#125397
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc

Conversation

@tommcdon

Copy link
Copy Markdown
Member

This change implements a TODO item in EEClass::AddMethodDesc to support Runtime Async

@tommcdontommcdon added this to the 11.0.0 milestone Mar 10, 2026
@tommcdontommcdon self-assigned this Mar 10, 2026
CopilotAI review requested due to automatic review settings March 10, 2026 18:34
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

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 PR implements runtime-async method variant support in the Edit-and-Continue (EnC) path by extending EEClass::AddMethodDesc/EEClass::AddMethod to carry async metadata (flags + optional alternate signature) and by updating EnC method update logic to consider async method variants.

Changes:

  • Extend EEClass::AddMethodDesc to accept async flags and an optional async-variant signature, and plumb that into MethodTableBuilder::InitMethodDesc.
  • Add async return-type classification and async-variant creation logic to EEClass::AddMethod.
  • Update EditAndContinueModule::UpdateMethod to also reset the entrypoint for the method’s async counterpart.

Reviewed changes

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

FileDescription
src/coreclr/vm/encee.cppResets entrypoints for async counterparts during EnC method updates.
src/coreclr/vm/class.hExtends AddMethodDesc signature to accept async flags and optional async signature.
src/coreclr/vm/class.cppImplements async return classification and passes async flags/signature into EnC-added MethodDesc creation.

You can also share your feedback on Copilot code review. Take the survey.

Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from 76d4eb1 to 437f9edCompareMarch 20, 2026 20:08
@tommcdon
tommcdon marked this pull request as ready for review March 20, 2026 20:09
CopilotAI review requested due to automatic review settings March 20, 2026 20:09

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

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

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp
tommcdon added a commit to tommcdon/runtime that referenced this pull request Apr 3, 2026
…ejection, generic UpdateMethod comment
- class.cpp:579: Update GC violation comment to acknowledge the
extern-alias edge case as Won't Fix per reviewer feedback
- class.cpp:597: Reject infrastructure async methods (IsMiAsync but
not task-returning) on non-system modules with COR_E_BADIMAGEFORMAT,
mirroring MethodTableBuilder validation
- encee.cpp:388: Add comment explaining that ResetCodeEntryPointForEnC
cascades from thunk to async variant automatically, so generic
UpdateMethod path does not need explicit async variant handling
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 3, 2026 00:50

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated

@noahfalknoahfalk 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.

Looks good 👍 Couple suggestions inline

CopilotAI review requested due to automatic review settings April 4, 2026 23:20

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
CopilotAI review requested due to automatic review settings April 5, 2026 02:41
CopilotAI review requested due to automatic review settings April 17, 2026 01:11
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from ec5469d to fb41135CompareApril 17, 2026 01:11

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

Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.

Instead of lazily creating async variant MethodDescs in
FindOrCreateAssociatedMethodDesc, create them eagerly alongside the
primary thunk in EEClass::AddMethod. The variant signature is computed
once from metadata and then AddMethodDesc (GC_NOTRIGGER) creates both
MethodDescs. For generic types, each existing instantiation gets its
own sig copy from its loader allocator.
This eliminates:
- Lazy creation block in FCAMD (double-check locking, GCX_COOP, lock)
- LoadTypicalMethodDefinition fallback for async variants
- EEClass::AddAsyncVariant helper (no longer needed)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
tommcdonand others added 3 commits April 21, 2026 11:15
Previously AddMethod only created async variants for IsMiAsync methods.
Normal type loading (MethodTableBuilder::EnumerateClassMethods) creates
variants for all task-returning methods regardless of IsMiAsync. This
change aligns EnC with that behavior:
- IsMiAsync: primary is thunk, async variant owns the IL
- Non-IsMiAsync: primary owns IL, async variant is a thunk
Also removes per-instantiation signature copy for generic types since
instantiations cannot have longer lifetime than the definition.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace inline NonGenericTask and GenericTask signature rewriting in
MethodTableBuilder::EnumerateClassMethods with calls to the shared
BuildAsyncVariantSignature function. The ReturnDroppingThunk case
(rare covariant override scenario) remains inline since it has
unique logic not applicable to the EnC path.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
For task-returning methods with async variants, detect when the primary
MethodDesc is a thunk and switch to the async variant that owns the user
code before planting remap breakpoints. This eliminates the duplicated
breakpoint-planting loop that previously handled the async variant
separately.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 21, 2026 16:33

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

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/methodtablebuilder.cpp
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
tommcdonand others added 3 commits April 23, 2026 14:35
Per reviewer feedback, inline the sig construction directly in
EEClass::AddMethod instead of using a shared BuildAsyncVariantSignature
function. Remove the function from method.cpp/method.hpp. Revert all
changes to genmeth.cpp and methodtablebuilder.cpp as no modifications
are needed in the normal type loading path for the EnC feature.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per reviewer feedback, return S_OK instead of falling through when
GetAsyncVariantNoCreate() returns NULL for an async thunk. There is
no user code to plant remap breakpoints on in this case.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Re-add comment explaining the Won't Fix corner cases around the
CONTRACT_VIOLATION(GCViolation) in EnC async variant creation:
type identity may not match well-known types, and the call may
trigger GC even for well-known types.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@tommcdon

Copy link
Copy Markdown
MemberAuthor

/ba-g failures are pre-existing/unrelated

@tommcdon
tommcdon merged commit bd6bb0d into dotnet:mainApr 23, 2026
104 of 109 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tommcdon@noahfalk@jkotas@VSadov
, '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

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod - #125397

Merged
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc
Apr 23, 2026
Merged

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod#125397
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc

Conversation

@tommcdon

Copy link
Copy Markdown
Member

This change implements a TODO item in EEClass::AddMethodDesc to support Runtime Async

@tommcdontommcdon added this to the 11.0.0 milestone Mar 10, 2026
@tommcdontommcdon self-assigned this Mar 10, 2026
CopilotAI review requested due to automatic review settings March 10, 2026 18:34
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

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 PR implements runtime-async method variant support in the Edit-and-Continue (EnC) path by extending EEClass::AddMethodDesc/EEClass::AddMethod to carry async metadata (flags + optional alternate signature) and by updating EnC method update logic to consider async method variants.

Changes:

  • Extend EEClass::AddMethodDesc to accept async flags and an optional async-variant signature, and plumb that into MethodTableBuilder::InitMethodDesc.
  • Add async return-type classification and async-variant creation logic to EEClass::AddMethod.
  • Update EditAndContinueModule::UpdateMethod to also reset the entrypoint for the method’s async counterpart.

Reviewed changes

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

FileDescription
src/coreclr/vm/encee.cppResets entrypoints for async counterparts during EnC method updates.
src/coreclr/vm/class.hExtends AddMethodDesc signature to accept async flags and optional async signature.
src/coreclr/vm/class.cppImplements async return classification and passes async flags/signature into EnC-added MethodDesc creation.

You can also share your feedback on Copilot code review. Take the survey.

Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from 76d4eb1 to 437f9edCompareMarch 20, 2026 20:08
@tommcdon
tommcdon marked this pull request as ready for review March 20, 2026 20:09
CopilotAI review requested due to automatic review settings March 20, 2026 20:09

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

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

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp
tommcdon added a commit to tommcdon/runtime that referenced this pull request Apr 3, 2026
…ejection, generic UpdateMethod comment
- class.cpp:579: Update GC violation comment to acknowledge the
extern-alias edge case as Won't Fix per reviewer feedback
- class.cpp:597: Reject infrastructure async methods (IsMiAsync but
not task-returning) on non-system modules with COR_E_BADIMAGEFORMAT,
mirroring MethodTableBuilder validation
- encee.cpp:388: Add comment explaining that ResetCodeEntryPointForEnC
cascades from thunk to async variant automatically, so generic
UpdateMethod path does not need explicit async variant handling
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 3, 2026 00:50

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated

@noahfalknoahfalk 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.

Looks good 👍 Couple suggestions inline

CopilotAI review requested due to automatic review settings April 4, 2026 23:20

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
CopilotAI review requested due to automatic review settings April 5, 2026 02:41
CopilotAI review requested due to automatic review settings April 17, 2026 01:11
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from ec5469d to fb41135CompareApril 17, 2026 01:11

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

Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.

Instead of lazily creating async variant MethodDescs in
FindOrCreateAssociatedMethodDesc, create them eagerly alongside the
primary thunk in EEClass::AddMethod. The variant signature is computed
once from metadata and then AddMethodDesc (GC_NOTRIGGER) creates both
MethodDescs. For generic types, each existing instantiation gets its
own sig copy from its loader allocator.
This eliminates:
- Lazy creation block in FCAMD (double-check locking, GCX_COOP, lock)
- LoadTypicalMethodDefinition fallback for async variants
- EEClass::AddAsyncVariant helper (no longer needed)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
tommcdonand others added 3 commits April 21, 2026 11:15
Previously AddMethod only created async variants for IsMiAsync methods.
Normal type loading (MethodTableBuilder::EnumerateClassMethods) creates
variants for all task-returning methods regardless of IsMiAsync. This
change aligns EnC with that behavior:
- IsMiAsync: primary is thunk, async variant owns the IL
- Non-IsMiAsync: primary owns IL, async variant is a thunk
Also removes per-instantiation signature copy for generic types since
instantiations cannot have longer lifetime than the definition.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace inline NonGenericTask and GenericTask signature rewriting in
MethodTableBuilder::EnumerateClassMethods with calls to the shared
BuildAsyncVariantSignature function. The ReturnDroppingThunk case
(rare covariant override scenario) remains inline since it has
unique logic not applicable to the EnC path.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
For task-returning methods with async variants, detect when the primary
MethodDesc is a thunk and switch to the async variant that owns the user
code before planting remap breakpoints. This eliminates the duplicated
breakpoint-planting loop that previously handled the async variant
separately.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 21, 2026 16:33

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

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/methodtablebuilder.cpp
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
tommcdonand others added 3 commits April 23, 2026 14:35
Per reviewer feedback, inline the sig construction directly in
EEClass::AddMethod instead of using a shared BuildAsyncVariantSignature
function. Remove the function from method.cpp/method.hpp. Revert all
changes to genmeth.cpp and methodtablebuilder.cpp as no modifications
are needed in the normal type loading path for the EnC feature.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per reviewer feedback, return S_OK instead of falling through when
GetAsyncVariantNoCreate() returns NULL for an async thunk. There is
no user code to plant remap breakpoints on in this case.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Re-add comment explaining the Won't Fix corner cases around the
CONTRACT_VIOLATION(GCViolation) in EnC async variant creation:
type identity may not match well-known types, and the call may
trigger GC even for well-known types.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@tommcdon

Copy link
Copy Markdown
MemberAuthor

/ba-g failures are pre-existing/unrelated

@tommcdon
tommcdon merged commit bd6bb0d into dotnet:mainApr 23, 2026
104 of 109 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tommcdon@noahfalk@jkotas@VSadov
, '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

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod - #125397

Merged
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc
Apr 23, 2026
Merged

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod#125397
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc

Conversation

@tommcdon

Copy link
Copy Markdown
Member

This change implements a TODO item in EEClass::AddMethodDesc to support Runtime Async

@tommcdontommcdon added this to the 11.0.0 milestone Mar 10, 2026
@tommcdontommcdon self-assigned this Mar 10, 2026
CopilotAI review requested due to automatic review settings March 10, 2026 18:34
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

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 PR implements runtime-async method variant support in the Edit-and-Continue (EnC) path by extending EEClass::AddMethodDesc/EEClass::AddMethod to carry async metadata (flags + optional alternate signature) and by updating EnC method update logic to consider async method variants.

Changes:

  • Extend EEClass::AddMethodDesc to accept async flags and an optional async-variant signature, and plumb that into MethodTableBuilder::InitMethodDesc.
  • Add async return-type classification and async-variant creation logic to EEClass::AddMethod.
  • Update EditAndContinueModule::UpdateMethod to also reset the entrypoint for the method’s async counterpart.

Reviewed changes

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

FileDescription
src/coreclr/vm/encee.cppResets entrypoints for async counterparts during EnC method updates.
src/coreclr/vm/class.hExtends AddMethodDesc signature to accept async flags and optional async signature.
src/coreclr/vm/class.cppImplements async return classification and passes async flags/signature into EnC-added MethodDesc creation.

You can also share your feedback on Copilot code review. Take the survey.

Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from 76d4eb1 to 437f9edCompareMarch 20, 2026 20:08
@tommcdon
tommcdon marked this pull request as ready for review March 20, 2026 20:09
CopilotAI review requested due to automatic review settings March 20, 2026 20:09

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

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

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp
tommcdon added a commit to tommcdon/runtime that referenced this pull request Apr 3, 2026
…ejection, generic UpdateMethod comment
- class.cpp:579: Update GC violation comment to acknowledge the
extern-alias edge case as Won't Fix per reviewer feedback
- class.cpp:597: Reject infrastructure async methods (IsMiAsync but
not task-returning) on non-system modules with COR_E_BADIMAGEFORMAT,
mirroring MethodTableBuilder validation
- encee.cpp:388: Add comment explaining that ResetCodeEntryPointForEnC
cascades from thunk to async variant automatically, so generic
UpdateMethod path does not need explicit async variant handling
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 3, 2026 00:50

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated

@noahfalknoahfalk 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.

Looks good 👍 Couple suggestions inline

CopilotAI review requested due to automatic review settings April 4, 2026 23:20

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
CopilotAI review requested due to automatic review settings April 5, 2026 02:41
CopilotAI review requested due to automatic review settings April 17, 2026 01:11
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from ec5469d to fb41135CompareApril 17, 2026 01:11

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

Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.

Instead of lazily creating async variant MethodDescs in
FindOrCreateAssociatedMethodDesc, create them eagerly alongside the
primary thunk in EEClass::AddMethod. The variant signature is computed
once from metadata and then AddMethodDesc (GC_NOTRIGGER) creates both
MethodDescs. For generic types, each existing instantiation gets its
own sig copy from its loader allocator.
This eliminates:
- Lazy creation block in FCAMD (double-check locking, GCX_COOP, lock)
- LoadTypicalMethodDefinition fallback for async variants
- EEClass::AddAsyncVariant helper (no longer needed)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
tommcdonand others added 3 commits April 21, 2026 11:15
Previously AddMethod only created async variants for IsMiAsync methods.
Normal type loading (MethodTableBuilder::EnumerateClassMethods) creates
variants for all task-returning methods regardless of IsMiAsync. This
change aligns EnC with that behavior:
- IsMiAsync: primary is thunk, async variant owns the IL
- Non-IsMiAsync: primary owns IL, async variant is a thunk
Also removes per-instantiation signature copy for generic types since
instantiations cannot have longer lifetime than the definition.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace inline NonGenericTask and GenericTask signature rewriting in
MethodTableBuilder::EnumerateClassMethods with calls to the shared
BuildAsyncVariantSignature function. The ReturnDroppingThunk case
(rare covariant override scenario) remains inline since it has
unique logic not applicable to the EnC path.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
For task-returning methods with async variants, detect when the primary
MethodDesc is a thunk and switch to the async variant that owns the user
code before planting remap breakpoints. This eliminates the duplicated
breakpoint-planting loop that previously handled the async variant
separately.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 21, 2026 16:33

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

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/methodtablebuilder.cpp
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
tommcdonand others added 3 commits April 23, 2026 14:35
Per reviewer feedback, inline the sig construction directly in
EEClass::AddMethod instead of using a shared BuildAsyncVariantSignature
function. Remove the function from method.cpp/method.hpp. Revert all
changes to genmeth.cpp and methodtablebuilder.cpp as no modifications
are needed in the normal type loading path for the EnC feature.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per reviewer feedback, return S_OK instead of falling through when
GetAsyncVariantNoCreate() returns NULL for an async thunk. There is
no user code to plant remap breakpoints on in this case.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Re-add comment explaining the Won't Fix corner cases around the
CONTRACT_VIOLATION(GCViolation) in EnC async variant creation:
type identity may not match well-known types, and the call may
trigger GC even for well-known types.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@tommcdon

Copy link
Copy Markdown
MemberAuthor

/ba-g failures are pre-existing/unrelated

@tommcdon
tommcdon merged commit bd6bb0d into dotnet:mainApr 23, 2026
104 of 109 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tommcdon@noahfalk@jkotas@VSadov
, '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

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod - #125397

Merged
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc
Apr 23, 2026
Merged

[Async v2] Implement async method variant handling in AddMethod and UpdateMethod#125397
tommcdon merged 29 commits into
dotnet:mainfrom
tommcdon:dev/tommcdon/implement_addmethoddesc

Conversation

@tommcdon

Copy link
Copy Markdown
Member

This change implements a TODO item in EEClass::AddMethodDesc to support Runtime Async

@tommcdontommcdon added this to the 11.0.0 milestone Mar 10, 2026
@tommcdontommcdon self-assigned this Mar 10, 2026
CopilotAI review requested due to automatic review settings March 10, 2026 18:34
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

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 PR implements runtime-async method variant support in the Edit-and-Continue (EnC) path by extending EEClass::AddMethodDesc/EEClass::AddMethod to carry async metadata (flags + optional alternate signature) and by updating EnC method update logic to consider async method variants.

Changes:

  • Extend EEClass::AddMethodDesc to accept async flags and an optional async-variant signature, and plumb that into MethodTableBuilder::InitMethodDesc.
  • Add async return-type classification and async-variant creation logic to EEClass::AddMethod.
  • Update EditAndContinueModule::UpdateMethod to also reset the entrypoint for the method’s async counterpart.

Reviewed changes

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

FileDescription
src/coreclr/vm/encee.cppResets entrypoints for async counterparts during EnC method updates.
src/coreclr/vm/class.hExtends AddMethodDesc signature to accept async flags and optional async signature.
src/coreclr/vm/class.cppImplements async return classification and passes async flags/signature into EnC-added MethodDesc creation.

You can also share your feedback on Copilot code review. Take the survey.

Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from 76d4eb1 to 437f9edCompareMarch 20, 2026 20:08
@tommcdon
tommcdon marked this pull request as ready for review March 20, 2026 20:09
CopilotAI review requested due to automatic review settings March 20, 2026 20:09

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

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

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/encee.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/encee.cpp
tommcdon added a commit to tommcdon/runtime that referenced this pull request Apr 3, 2026
…ejection, generic UpdateMethod comment
- class.cpp:579: Update GC violation comment to acknowledge the
extern-alias edge case as Won't Fix per reviewer feedback
- class.cpp:597: Reject infrastructure async methods (IsMiAsync but
not task-returning) on non-system modules with COR_E_BADIMAGEFORMAT,
mirroring MethodTableBuilder validation
- encee.cpp:388: Add comment explaining that ResetCodeEntryPointForEnC
cascades from thunk to async variant automatically, so generic
UpdateMethod path does not need explicit async variant handling
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 3, 2026 00:50

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated

@noahfalknoahfalk 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.

Looks good 👍 Couple suggestions inline

CopilotAI review requested due to automatic review settings April 4, 2026 23:20

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

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
CopilotAI review requested due to automatic review settings April 5, 2026 02:41
CopilotAI review requested due to automatic review settings April 17, 2026 01:11
@tommcdon
tommcdonforce-pushed the dev/tommcdon/implement_addmethoddesc branch from ec5469d to fb41135CompareApril 17, 2026 01:11

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

Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.

Instead of lazily creating async variant MethodDescs in
FindOrCreateAssociatedMethodDesc, create them eagerly alongside the
primary thunk in EEClass::AddMethod. The variant signature is computed
once from metadata and then AddMethodDesc (GC_NOTRIGGER) creates both
MethodDescs. For generic types, each existing instantiation gets its
own sig copy from its loader allocator.
This eliminates:
- Lazy creation block in FCAMD (double-check locking, GCX_COOP, lock)
- LoadTypicalMethodDefinition fallback for async variants
- EEClass::AddAsyncVariant helper (no longer needed)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/method.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
tommcdonand others added 3 commits April 21, 2026 11:15
Previously AddMethod only created async variants for IsMiAsync methods.
Normal type loading (MethodTableBuilder::EnumerateClassMethods) creates
variants for all task-returning methods regardless of IsMiAsync. This
change aligns EnC with that behavior:
- IsMiAsync: primary is thunk, async variant owns the IL
- Non-IsMiAsync: primary owns IL, async variant is a thunk
Also removes per-instantiation signature copy for generic types since
instantiations cannot have longer lifetime than the definition.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace inline NonGenericTask and GenericTask signature rewriting in
MethodTableBuilder::EnumerateClassMethods with calls to the shared
BuildAsyncVariantSignature function. The ReturnDroppingThunk case
(rare covariant override scenario) remains inline since it has
unique logic not applicable to the EnC path.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
For task-returning methods with async variants, detect when the primary
MethodDesc is a thunk and switch to the async variant that owns the user
code before planting remap breakpoints. This eliminates the duplicated
breakpoint-planting loop that previously handled the async variant
separately.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 21, 2026 16:33

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

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment threadsrc/coreclr/vm/class.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/debug/ee/debugger.cpp Outdated
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/methodtablebuilder.cpp
Comment threadsrc/coreclr/vm/class.cpp
Comment threadsrc/coreclr/vm/genmeth.cpp Outdated
Comment threadsrc/coreclr/vm/class.cpp Outdated
tommcdonand others added 3 commits April 23, 2026 14:35
Per reviewer feedback, inline the sig construction directly in
EEClass::AddMethod instead of using a shared BuildAsyncVariantSignature
function. Remove the function from method.cpp/method.hpp. Revert all
changes to genmeth.cpp and methodtablebuilder.cpp as no modifications
are needed in the normal type loading path for the EnC feature.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per reviewer feedback, return S_OK instead of falling through when
GetAsyncVariantNoCreate() returns NULL for an async thunk. There is
no user code to plant remap breakpoints on in this case.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Re-add comment explaining the Won't Fix corner cases around the
CONTRACT_VIOLATION(GCViolation) in EnC async variant creation:
type identity may not match well-known types, and the call may
trigger GC even for well-known types.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@tommcdon

Copy link
Copy Markdown
MemberAuthor

/ba-g failures are pre-existing/unrelated

@tommcdon
tommcdon merged commit bd6bb0d into dotnet:mainApr 23, 2026
104 of 109 checks passed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tommcdon@noahfalk@jkotas@VSadov