Fix RuntimeMethodHandle cache key for async variants - #128432

Merged
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning
May 22, 2026
Merged

Fix RuntimeMethodHandle cache key for async variants#128432
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning

Conversation

CopilotAI commented May 21, 2026

Copy link
Copy Markdown
Contributor

Fixes#128286
Fixes#128291

NativeAOT TypeLoader was interning dynamically created RuntimeMethodHandles without including the async-variant bit in the key. This could cause async/non-async lookups for the same method components to alias to one cached handle and resolve the wrong method variant; this change makes async variant part of handle identity and re-enables the affected System.Text.Json source-gen test project.

  • TypeLoader runtime method handle key

    • Extended RuntimeMethodHandleKey to include isAsyncVariant in identity.
    • Updated constructor and key creation to pass/store isAsyncVariant.
    • Updated Equals to require matching async-variant state.
    • Updated GetHashCode to include async-variant state via VersionResilientHashCode.CombineTwoValuesIntoHash.
    • Added the required explicit uncheckedint/uint casts around the hash combiner call so the NativeAOT TypeLoader build compiles correctly.
  • NativeAOT libraries test project inclusion

    • Removed the NativeAOT exclusion entry for:
      • System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj
    • Kept unrelated platform-specific exclusions intact.
// before: async flag omitted from interning keyRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs);// after: async flag is part of key identityRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs,isAsyncVariant);

This pull request was created from Copilot chat.
>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:41
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:45
CopilotAI changed the title [WIP] Fix NativeAOT RuntimeMethodHandle interning for async variantsFix RuntimeMethodHandle cache key for async variantsMay 21, 2026
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

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 updates NativeAOT’s TypeLoader RuntimeMethodHandle interning to treat the “async variant” bit as part of a handle’s identity, preventing cache aliasing between async/non-async variants. It also re-enables the previously excluded System.Text.Json.SourceGeneration.Roslyn4.4.Tests project for most NativeAOT configurations by removing the broad exclusion while keeping existing OS/arch-specific exclusions.

Changes:

  • Extended RuntimeMethodHandleKey to include the async-variant flag in equality and hashing, and passed the flag when creating interning keys.
  • Updated hashing logic for RuntimeMethodHandleKey to incorporate the async-variant flag.
  • Removed the unconditional NativeAOT test exclusion for System.Text.Json.SourceGeneration.Roslyn4.4.Tests (while retaining existing conditional exclusions, e.g., OS/arch-specific cases).

Reviewed changes

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

FileDescription
src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.LdTokenResultLookup.csAdds isAsyncVariant into the runtime method handle interning key (equals/hash + key construction).
src/libraries/tests.projRe-enables System.Text.Json.SourceGeneration.Roslyn4.4.Tests for NativeAOT by removing the broad exclusion entry.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 21, 2026 21:18

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 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 22, 2026 06:53

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 2 out of 2 changed files in this pull request and generated 1 comment.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a5409eb1-4c15-4ea9-8512-3d96a17b9c06
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eduardo-vpeduardo-vp 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.

LGTM! Just looks like Copilot removed from the PR description the issues that this PR fixes.

@MichalStrehovsky
MichalStrehovsky merged commit 2af3693 into mainMay 22, 2026
153 of 157 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the copilot/fix-runtime-method-handle-interning branch May 22, 2026 20:33
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone May 23, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 23, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

5 participants

@MichalStrehovsky@jakobbotsch@eduardo-vp
, '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

Fix RuntimeMethodHandle cache key for async variants - #128432

Merged
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning
May 22, 2026
Merged

Fix RuntimeMethodHandle cache key for async variants#128432
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning

Conversation

CopilotAI commented May 21, 2026

Copy link
Copy Markdown
Contributor

Fixes#128286
Fixes#128291

NativeAOT TypeLoader was interning dynamically created RuntimeMethodHandles without including the async-variant bit in the key. This could cause async/non-async lookups for the same method components to alias to one cached handle and resolve the wrong method variant; this change makes async variant part of handle identity and re-enables the affected System.Text.Json source-gen test project.

  • TypeLoader runtime method handle key

    • Extended RuntimeMethodHandleKey to include isAsyncVariant in identity.
    • Updated constructor and key creation to pass/store isAsyncVariant.
    • Updated Equals to require matching async-variant state.
    • Updated GetHashCode to include async-variant state via VersionResilientHashCode.CombineTwoValuesIntoHash.
    • Added the required explicit uncheckedint/uint casts around the hash combiner call so the NativeAOT TypeLoader build compiles correctly.
  • NativeAOT libraries test project inclusion

    • Removed the NativeAOT exclusion entry for:
      • System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj
    • Kept unrelated platform-specific exclusions intact.
// before: async flag omitted from interning keyRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs);// after: async flag is part of key identityRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs,isAsyncVariant);

This pull request was created from Copilot chat.
>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:41
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:45
CopilotAI changed the title [WIP] Fix NativeAOT RuntimeMethodHandle interning for async variantsFix RuntimeMethodHandle cache key for async variantsMay 21, 2026
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

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 updates NativeAOT’s TypeLoader RuntimeMethodHandle interning to treat the “async variant” bit as part of a handle’s identity, preventing cache aliasing between async/non-async variants. It also re-enables the previously excluded System.Text.Json.SourceGeneration.Roslyn4.4.Tests project for most NativeAOT configurations by removing the broad exclusion while keeping existing OS/arch-specific exclusions.

Changes:

  • Extended RuntimeMethodHandleKey to include the async-variant flag in equality and hashing, and passed the flag when creating interning keys.
  • Updated hashing logic for RuntimeMethodHandleKey to incorporate the async-variant flag.
  • Removed the unconditional NativeAOT test exclusion for System.Text.Json.SourceGeneration.Roslyn4.4.Tests (while retaining existing conditional exclusions, e.g., OS/arch-specific cases).

Reviewed changes

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

FileDescription
src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.LdTokenResultLookup.csAdds isAsyncVariant into the runtime method handle interning key (equals/hash + key construction).
src/libraries/tests.projRe-enables System.Text.Json.SourceGeneration.Roslyn4.4.Tests for NativeAOT by removing the broad exclusion entry.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 21, 2026 21:18

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 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 22, 2026 06:53

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 2 out of 2 changed files in this pull request and generated 1 comment.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a5409eb1-4c15-4ea9-8512-3d96a17b9c06
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eduardo-vpeduardo-vp 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.

LGTM! Just looks like Copilot removed from the PR description the issues that this PR fixes.

@MichalStrehovsky
MichalStrehovsky merged commit 2af3693 into mainMay 22, 2026
153 of 157 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the copilot/fix-runtime-method-handle-interning branch May 22, 2026 20:33
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone May 23, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 23, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

5 participants

@MichalStrehovsky@jakobbotsch@eduardo-vp
, '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

Fix RuntimeMethodHandle cache key for async variants - #128432

Merged
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning
May 22, 2026
Merged

Fix RuntimeMethodHandle cache key for async variants#128432
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning

Conversation

CopilotAI commented May 21, 2026

Copy link
Copy Markdown
Contributor

Fixes#128286
Fixes#128291

NativeAOT TypeLoader was interning dynamically created RuntimeMethodHandles without including the async-variant bit in the key. This could cause async/non-async lookups for the same method components to alias to one cached handle and resolve the wrong method variant; this change makes async variant part of handle identity and re-enables the affected System.Text.Json source-gen test project.

  • TypeLoader runtime method handle key

    • Extended RuntimeMethodHandleKey to include isAsyncVariant in identity.
    • Updated constructor and key creation to pass/store isAsyncVariant.
    • Updated Equals to require matching async-variant state.
    • Updated GetHashCode to include async-variant state via VersionResilientHashCode.CombineTwoValuesIntoHash.
    • Added the required explicit uncheckedint/uint casts around the hash combiner call so the NativeAOT TypeLoader build compiles correctly.
  • NativeAOT libraries test project inclusion

    • Removed the NativeAOT exclusion entry for:
      • System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj
    • Kept unrelated platform-specific exclusions intact.
// before: async flag omitted from interning keyRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs);// after: async flag is part of key identityRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs,isAsyncVariant);

This pull request was created from Copilot chat.
>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:41
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:45
CopilotAI changed the title [WIP] Fix NativeAOT RuntimeMethodHandle interning for async variantsFix RuntimeMethodHandle cache key for async variantsMay 21, 2026
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

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 updates NativeAOT’s TypeLoader RuntimeMethodHandle interning to treat the “async variant” bit as part of a handle’s identity, preventing cache aliasing between async/non-async variants. It also re-enables the previously excluded System.Text.Json.SourceGeneration.Roslyn4.4.Tests project for most NativeAOT configurations by removing the broad exclusion while keeping existing OS/arch-specific exclusions.

Changes:

  • Extended RuntimeMethodHandleKey to include the async-variant flag in equality and hashing, and passed the flag when creating interning keys.
  • Updated hashing logic for RuntimeMethodHandleKey to incorporate the async-variant flag.
  • Removed the unconditional NativeAOT test exclusion for System.Text.Json.SourceGeneration.Roslyn4.4.Tests (while retaining existing conditional exclusions, e.g., OS/arch-specific cases).

Reviewed changes

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

FileDescription
src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.LdTokenResultLookup.csAdds isAsyncVariant into the runtime method handle interning key (equals/hash + key construction).
src/libraries/tests.projRe-enables System.Text.Json.SourceGeneration.Roslyn4.4.Tests for NativeAOT by removing the broad exclusion entry.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 21, 2026 21:18

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 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 22, 2026 06:53

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 2 out of 2 changed files in this pull request and generated 1 comment.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a5409eb1-4c15-4ea9-8512-3d96a17b9c06
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eduardo-vpeduardo-vp 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.

LGTM! Just looks like Copilot removed from the PR description the issues that this PR fixes.

@MichalStrehovsky
MichalStrehovsky merged commit 2af3693 into mainMay 22, 2026
153 of 157 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the copilot/fix-runtime-method-handle-interning branch May 22, 2026 20:33
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone May 23, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 23, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

5 participants

@MichalStrehovsky@jakobbotsch@eduardo-vp
, '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

Fix RuntimeMethodHandle cache key for async variants - #128432

Merged
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning
May 22, 2026
Merged

Fix RuntimeMethodHandle cache key for async variants#128432
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning

Conversation

CopilotAI commented May 21, 2026

Copy link
Copy Markdown
Contributor

Fixes#128286
Fixes#128291

NativeAOT TypeLoader was interning dynamically created RuntimeMethodHandles without including the async-variant bit in the key. This could cause async/non-async lookups for the same method components to alias to one cached handle and resolve the wrong method variant; this change makes async variant part of handle identity and re-enables the affected System.Text.Json source-gen test project.

  • TypeLoader runtime method handle key

    • Extended RuntimeMethodHandleKey to include isAsyncVariant in identity.
    • Updated constructor and key creation to pass/store isAsyncVariant.
    • Updated Equals to require matching async-variant state.
    • Updated GetHashCode to include async-variant state via VersionResilientHashCode.CombineTwoValuesIntoHash.
    • Added the required explicit uncheckedint/uint casts around the hash combiner call so the NativeAOT TypeLoader build compiles correctly.
  • NativeAOT libraries test project inclusion

    • Removed the NativeAOT exclusion entry for:
      • System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj
    • Kept unrelated platform-specific exclusions intact.
// before: async flag omitted from interning keyRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs);// after: async flag is part of key identityRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs,isAsyncVariant);

This pull request was created from Copilot chat.
>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:41
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:45
CopilotAI changed the title [WIP] Fix NativeAOT RuntimeMethodHandle interning for async variantsFix RuntimeMethodHandle cache key for async variantsMay 21, 2026
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

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 updates NativeAOT’s TypeLoader RuntimeMethodHandle interning to treat the “async variant” bit as part of a handle’s identity, preventing cache aliasing between async/non-async variants. It also re-enables the previously excluded System.Text.Json.SourceGeneration.Roslyn4.4.Tests project for most NativeAOT configurations by removing the broad exclusion while keeping existing OS/arch-specific exclusions.

Changes:

  • Extended RuntimeMethodHandleKey to include the async-variant flag in equality and hashing, and passed the flag when creating interning keys.
  • Updated hashing logic for RuntimeMethodHandleKey to incorporate the async-variant flag.
  • Removed the unconditional NativeAOT test exclusion for System.Text.Json.SourceGeneration.Roslyn4.4.Tests (while retaining existing conditional exclusions, e.g., OS/arch-specific cases).

Reviewed changes

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

FileDescription
src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.LdTokenResultLookup.csAdds isAsyncVariant into the runtime method handle interning key (equals/hash + key construction).
src/libraries/tests.projRe-enables System.Text.Json.SourceGeneration.Roslyn4.4.Tests for NativeAOT by removing the broad exclusion entry.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 21, 2026 21:18

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 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 22, 2026 06:53

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 2 out of 2 changed files in this pull request and generated 1 comment.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a5409eb1-4c15-4ea9-8512-3d96a17b9c06
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eduardo-vpeduardo-vp 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.

LGTM! Just looks like Copilot removed from the PR description the issues that this PR fixes.

@MichalStrehovsky
MichalStrehovsky merged commit 2af3693 into mainMay 22, 2026
153 of 157 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the copilot/fix-runtime-method-handle-interning branch May 22, 2026 20:33
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone May 23, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 23, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

5 participants

@MichalStrehovsky@jakobbotsch@eduardo-vp
, '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

Fix RuntimeMethodHandle cache key for async variants - #128432

Merged
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning
May 22, 2026
Merged

Fix RuntimeMethodHandle cache key for async variants#128432
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning

Conversation

CopilotAI commented May 21, 2026

Copy link
Copy Markdown
Contributor

Fixes#128286
Fixes#128291

NativeAOT TypeLoader was interning dynamically created RuntimeMethodHandles without including the async-variant bit in the key. This could cause async/non-async lookups for the same method components to alias to one cached handle and resolve the wrong method variant; this change makes async variant part of handle identity and re-enables the affected System.Text.Json source-gen test project.

  • TypeLoader runtime method handle key

    • Extended RuntimeMethodHandleKey to include isAsyncVariant in identity.
    • Updated constructor and key creation to pass/store isAsyncVariant.
    • Updated Equals to require matching async-variant state.
    • Updated GetHashCode to include async-variant state via VersionResilientHashCode.CombineTwoValuesIntoHash.
    • Added the required explicit uncheckedint/uint casts around the hash combiner call so the NativeAOT TypeLoader build compiles correctly.
  • NativeAOT libraries test project inclusion

    • Removed the NativeAOT exclusion entry for:
      • System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj
    • Kept unrelated platform-specific exclusions intact.
// before: async flag omitted from interning keyRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs);// after: async flag is part of key identityRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs,isAsyncVariant);

This pull request was created from Copilot chat.
>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:41
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:45
CopilotAI changed the title [WIP] Fix NativeAOT RuntimeMethodHandle interning for async variantsFix RuntimeMethodHandle cache key for async variantsMay 21, 2026
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

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 updates NativeAOT’s TypeLoader RuntimeMethodHandle interning to treat the “async variant” bit as part of a handle’s identity, preventing cache aliasing between async/non-async variants. It also re-enables the previously excluded System.Text.Json.SourceGeneration.Roslyn4.4.Tests project for most NativeAOT configurations by removing the broad exclusion while keeping existing OS/arch-specific exclusions.

Changes:

  • Extended RuntimeMethodHandleKey to include the async-variant flag in equality and hashing, and passed the flag when creating interning keys.
  • Updated hashing logic for RuntimeMethodHandleKey to incorporate the async-variant flag.
  • Removed the unconditional NativeAOT test exclusion for System.Text.Json.SourceGeneration.Roslyn4.4.Tests (while retaining existing conditional exclusions, e.g., OS/arch-specific cases).

Reviewed changes

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

FileDescription
src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.LdTokenResultLookup.csAdds isAsyncVariant into the runtime method handle interning key (equals/hash + key construction).
src/libraries/tests.projRe-enables System.Text.Json.SourceGeneration.Roslyn4.4.Tests for NativeAOT by removing the broad exclusion entry.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 21, 2026 21:18

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 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 22, 2026 06:53

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 2 out of 2 changed files in this pull request and generated 1 comment.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a5409eb1-4c15-4ea9-8512-3d96a17b9c06
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eduardo-vpeduardo-vp 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.

LGTM! Just looks like Copilot removed from the PR description the issues that this PR fixes.

@MichalStrehovsky
MichalStrehovsky merged commit 2af3693 into mainMay 22, 2026
153 of 157 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the copilot/fix-runtime-method-handle-interning branch May 22, 2026 20:33
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone May 23, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 23, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

5 participants

@MichalStrehovsky@jakobbotsch@eduardo-vp
, '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

Fix RuntimeMethodHandle cache key for async variants - #128432

Merged
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning
May 22, 2026
Merged

Fix RuntimeMethodHandle cache key for async variants#128432
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning

Conversation

CopilotAI commented May 21, 2026

Copy link
Copy Markdown
Contributor

Fixes#128286
Fixes#128291

NativeAOT TypeLoader was interning dynamically created RuntimeMethodHandles without including the async-variant bit in the key. This could cause async/non-async lookups for the same method components to alias to one cached handle and resolve the wrong method variant; this change makes async variant part of handle identity and re-enables the affected System.Text.Json source-gen test project.

  • TypeLoader runtime method handle key

    • Extended RuntimeMethodHandleKey to include isAsyncVariant in identity.
    • Updated constructor and key creation to pass/store isAsyncVariant.
    • Updated Equals to require matching async-variant state.
    • Updated GetHashCode to include async-variant state via VersionResilientHashCode.CombineTwoValuesIntoHash.
    • Added the required explicit uncheckedint/uint casts around the hash combiner call so the NativeAOT TypeLoader build compiles correctly.
  • NativeAOT libraries test project inclusion

    • Removed the NativeAOT exclusion entry for:
      • System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj
    • Kept unrelated platform-specific exclusions intact.
// before: async flag omitted from interning keyRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs);// after: async flag is part of key identityRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs,isAsyncVariant);

This pull request was created from Copilot chat.
>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:41
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:45
CopilotAI changed the title [WIP] Fix NativeAOT RuntimeMethodHandle interning for async variantsFix RuntimeMethodHandle cache key for async variantsMay 21, 2026
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

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 updates NativeAOT’s TypeLoader RuntimeMethodHandle interning to treat the “async variant” bit as part of a handle’s identity, preventing cache aliasing between async/non-async variants. It also re-enables the previously excluded System.Text.Json.SourceGeneration.Roslyn4.4.Tests project for most NativeAOT configurations by removing the broad exclusion while keeping existing OS/arch-specific exclusions.

Changes:

  • Extended RuntimeMethodHandleKey to include the async-variant flag in equality and hashing, and passed the flag when creating interning keys.
  • Updated hashing logic for RuntimeMethodHandleKey to incorporate the async-variant flag.
  • Removed the unconditional NativeAOT test exclusion for System.Text.Json.SourceGeneration.Roslyn4.4.Tests (while retaining existing conditional exclusions, e.g., OS/arch-specific cases).

Reviewed changes

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

FileDescription
src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.LdTokenResultLookup.csAdds isAsyncVariant into the runtime method handle interning key (equals/hash + key construction).
src/libraries/tests.projRe-enables System.Text.Json.SourceGeneration.Roslyn4.4.Tests for NativeAOT by removing the broad exclusion entry.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 21, 2026 21:18

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 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 22, 2026 06:53

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 2 out of 2 changed files in this pull request and generated 1 comment.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a5409eb1-4c15-4ea9-8512-3d96a17b9c06
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eduardo-vpeduardo-vp 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.

LGTM! Just looks like Copilot removed from the PR description the issues that this PR fixes.

@MichalStrehovsky
MichalStrehovsky merged commit 2af3693 into mainMay 22, 2026
153 of 157 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the copilot/fix-runtime-method-handle-interning branch May 22, 2026 20:33
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone May 23, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 23, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

5 participants

@MichalStrehovsky@jakobbotsch@eduardo-vp
, '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

Fix RuntimeMethodHandle cache key for async variants - #128432

Merged
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning
May 22, 2026
Merged

Fix RuntimeMethodHandle cache key for async variants#128432
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning

Conversation

CopilotAI commented May 21, 2026

Copy link
Copy Markdown
Contributor

Fixes#128286
Fixes#128291

NativeAOT TypeLoader was interning dynamically created RuntimeMethodHandles without including the async-variant bit in the key. This could cause async/non-async lookups for the same method components to alias to one cached handle and resolve the wrong method variant; this change makes async variant part of handle identity and re-enables the affected System.Text.Json source-gen test project.

  • TypeLoader runtime method handle key

    • Extended RuntimeMethodHandleKey to include isAsyncVariant in identity.
    • Updated constructor and key creation to pass/store isAsyncVariant.
    • Updated Equals to require matching async-variant state.
    • Updated GetHashCode to include async-variant state via VersionResilientHashCode.CombineTwoValuesIntoHash.
    • Added the required explicit uncheckedint/uint casts around the hash combiner call so the NativeAOT TypeLoader build compiles correctly.
  • NativeAOT libraries test project inclusion

    • Removed the NativeAOT exclusion entry for:
      • System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj
    • Kept unrelated platform-specific exclusions intact.
// before: async flag omitted from interning keyRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs);// after: async flag is part of key identityRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs,isAsyncVariant);

This pull request was created from Copilot chat.
>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:41
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:45
CopilotAI changed the title [WIP] Fix NativeAOT RuntimeMethodHandle interning for async variantsFix RuntimeMethodHandle cache key for async variantsMay 21, 2026
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

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 updates NativeAOT’s TypeLoader RuntimeMethodHandle interning to treat the “async variant” bit as part of a handle’s identity, preventing cache aliasing between async/non-async variants. It also re-enables the previously excluded System.Text.Json.SourceGeneration.Roslyn4.4.Tests project for most NativeAOT configurations by removing the broad exclusion while keeping existing OS/arch-specific exclusions.

Changes:

  • Extended RuntimeMethodHandleKey to include the async-variant flag in equality and hashing, and passed the flag when creating interning keys.
  • Updated hashing logic for RuntimeMethodHandleKey to incorporate the async-variant flag.
  • Removed the unconditional NativeAOT test exclusion for System.Text.Json.SourceGeneration.Roslyn4.4.Tests (while retaining existing conditional exclusions, e.g., OS/arch-specific cases).

Reviewed changes

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

FileDescription
src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.LdTokenResultLookup.csAdds isAsyncVariant into the runtime method handle interning key (equals/hash + key construction).
src/libraries/tests.projRe-enables System.Text.Json.SourceGeneration.Roslyn4.4.Tests for NativeAOT by removing the broad exclusion entry.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 21, 2026 21:18

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 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 22, 2026 06:53

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 2 out of 2 changed files in this pull request and generated 1 comment.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a5409eb1-4c15-4ea9-8512-3d96a17b9c06
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eduardo-vpeduardo-vp 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.

LGTM! Just looks like Copilot removed from the PR description the issues that this PR fixes.

@MichalStrehovsky
MichalStrehovsky merged commit 2af3693 into mainMay 22, 2026
153 of 157 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the copilot/fix-runtime-method-handle-interning branch May 22, 2026 20:33
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone May 23, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 23, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

5 participants

@MichalStrehovsky@jakobbotsch@eduardo-vp
, '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

Fix RuntimeMethodHandle cache key for async variants - #128432

Merged
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning
May 22, 2026
Merged

Fix RuntimeMethodHandle cache key for async variants#128432
MichalStrehovsky merged 6 commits into
mainfrom
copilot/fix-runtime-method-handle-interning

Conversation

CopilotAI commented May 21, 2026

Copy link
Copy Markdown
Contributor

Fixes#128286
Fixes#128291

NativeAOT TypeLoader was interning dynamically created RuntimeMethodHandles without including the async-variant bit in the key. This could cause async/non-async lookups for the same method components to alias to one cached handle and resolve the wrong method variant; this change makes async variant part of handle identity and re-enables the affected System.Text.Json source-gen test project.

  • TypeLoader runtime method handle key

    • Extended RuntimeMethodHandleKey to include isAsyncVariant in identity.
    • Updated constructor and key creation to pass/store isAsyncVariant.
    • Updated Equals to require matching async-variant state.
    • Updated GetHashCode to include async-variant state via VersionResilientHashCode.CombineTwoValuesIntoHash.
    • Added the required explicit uncheckedint/uint casts around the hash combiner call so the NativeAOT TypeLoader build compiles correctly.
  • NativeAOT libraries test project inclusion

    • Removed the NativeAOT exclusion entry for:
      • System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj
    • Kept unrelated platform-specific exclusions intact.
// before: async flag omitted from interning keyRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs);// after: async flag is part of key identityRuntimeMethodHandleKeykey=newRuntimeMethodHandleKey(declaringTypeHandle,handle,genericMethodArgs,isAsyncVariant);

This pull request was created from Copilot chat.
>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:41
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/865c991f-a15c-4cca-9b66-845450dd5e89
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotMay 21, 2026 07:45
CopilotAI changed the title [WIP] Fix NativeAOT RuntimeMethodHandle interning for async variantsFix RuntimeMethodHandle cache key for async variantsMay 21, 2026
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

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 updates NativeAOT’s TypeLoader RuntimeMethodHandle interning to treat the “async variant” bit as part of a handle’s identity, preventing cache aliasing between async/non-async variants. It also re-enables the previously excluded System.Text.Json.SourceGeneration.Roslyn4.4.Tests project for most NativeAOT configurations by removing the broad exclusion while keeping existing OS/arch-specific exclusions.

Changes:

  • Extended RuntimeMethodHandleKey to include the async-variant flag in equality and hashing, and passed the flag when creating interning keys.
  • Updated hashing logic for RuntimeMethodHandleKey to incorporate the async-variant flag.
  • Removed the unconditional NativeAOT test exclusion for System.Text.Json.SourceGeneration.Roslyn4.4.Tests (while retaining existing conditional exclusions, e.g., OS/arch-specific cases).

Reviewed changes

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

FileDescription
src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.LdTokenResultLookup.csAdds isAsyncVariant into the runtime method handle interning key (equals/hash + key construction).
src/libraries/tests.projRe-enables System.Text.Json.SourceGeneration.Roslyn4.4.Tests for NativeAOT by removing the broad exclusion entry.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 21, 2026 21:18

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 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings May 22, 2026 06:53

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 2 out of 2 changed files in this pull request and generated 1 comment.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a5409eb1-4c15-4ea9-8512-3d96a17b9c06
Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com>
@MichalStrehovsky

Copy link
Copy Markdown
Member

/azp run runtime-nativeaot-outerloop

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eduardo-vpeduardo-vp 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.

LGTM! Just looks like Copilot removed from the PR description the issues that this PR fixes.

@MichalStrehovsky
MichalStrehovsky merged commit 2af3693 into mainMay 22, 2026
153 of 157 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the copilot/fix-runtime-method-handle-interning branch May 22, 2026 20:33
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone May 23, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 23, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

5 participants

@MichalStrehovsky@jakobbotsch@eduardo-vp