Skip to content

Follow-ups to GVM dispatch change#130753

Merged
MichalStrehovsky merged 1 commit into
dotnet:mainfrom
MichalStrehovsky:fb
Jul 15, 2026
Merged

Follow-ups to GVM dispatch change#130753
MichalStrehovsky merged 1 commit into
dotnet:mainfrom
MichalStrehovsky:fb

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

No description provided.

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 3 pipeline(s).
12 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib
See info in area-owners.md if you want to be subscribed.

Copilot AI 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 makes small NativeAOT follow-up fixes around interface dispatch resolution by (1) explicitly naming the classlib callback ID used for dispatch resolution and (2) making the dispatch-resolve assembly’s internal control-flow labels unambiguous within the INTERFACE_DISPATCH macro expansions.

Changes:

  • Define ClasslibFunctionId::ResolveDispatch = 4 in ICodeManager.h (instead of leaving slot 4 unnamed/“unused”).
  • Replace numeric local labels (1f, 2b, etc.) with LOCAL_LABEL(...\@) labels in the arm64/amd64 DispatchResolve.S implementations to ensure per-macro-expansion label uniqueness/readability.

Reviewed changes

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

File Description
src/coreclr/nativeaot/Runtime/ICodeManager.h Names the classlib function slot 4 as ResolveDispatch to match the managed-side ID usage.
src/coreclr/nativeaot/Runtime/arm64/DispatchResolve.S Refactors internal branches to use LOCAL_LABEL(...\@) labels within INTERFACE_DISPATCH.
src/coreclr/nativeaot/Runtime/amd64/DispatchResolve.S Same label refactor as arm64, using LOCAL_LABEL(...\@) for macro-local label names.

@MichalStrehovsky
MichalStrehovsky merged commit 4563bdb into dotnet:main Jul 15, 2026
114 of 116 checks passed
@MichalStrehovsky
MichalStrehovsky deleted the fb branch July 15, 2026 23:45
@dotnet-milestone-bot dotnet-milestone-bot Bot added this to the 11.0-preview7 milestone Jul 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants