Skip to content

[wasm][coreclr] Fix native relinking#127177

Merged
radekdoulik merged 2 commits intodotnet:mainfrom
radekdoulik:fix-build-native-relinking
Apr 21, 2026
Merged

[wasm][coreclr] Fix native relinking#127177
radekdoulik merged 2 commits intodotnet:mainfrom
radekdoulik:fix-build-native-relinking

Conversation

@radekdoulik
Copy link
Copy Markdown
Member

@radekdoulik radekdoulik commented Apr 20, 2026

This should fix CI build and relinking, introduced in #126901 and masked by #90458 in build analysis

@radekdoulik radekdoulik added this to the Future milestone Apr 20, 2026
Copilot AI review requested due to automatic review settings April 20, 2026 20:28
@radekdoulik radekdoulik added arch-wasm WebAssembly architecture area-VM-coreclr labels Apr 20, 2026
@dotnet-policy-service
Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

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 targets the CoreCLR WASM native relink pipeline by ensuring relink-generated sources can access WASM-specific callhelper constants and required helper macros during compilation.

Changes:

  • Moves the TERMINATE_R2R_STACK_WALK sentinel definition into vm/wasm/callhelpers.hpp and wires it into vm/callhelpers.h for WASM builds.
  • Adds an include of minipal/utils.h to the checked-in generated callhelpers-interp-to-managed.cpp (intended to provide NOINLINE for portable-entrypoint call thunks).

Reviewed changes

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

File Description
src/coreclr/vm/wasm/callhelpers.hpp Defines TERMINATE_R2R_STACK_WALK in the header consumed by relink-generated thunks and other WASM helpers.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp Adds minipal/utils.h include (attempting to ensure NOINLINE is available for generated portable-entrypoint call helpers).
src/coreclr/vm/callhelpers.h Includes the WASM callhelpers header under TARGET_WASM (and removes the local sentinel definition).

Comment thread src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp
@radekdoulik radekdoulik enabled auto-merge (squash) April 20, 2026 21:59
@radekdoulik radekdoulik merged commit 6ffb214 into dotnet:main Apr 21, 2026
127 of 130 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

arch-wasm WebAssembly architecture area-VM-coreclr

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants