Adjust PortableEntryPoint logic to actually handle having Wasm R2R native entrypoints

[davidwrighton]

• This includes some initial work where there is a predefined set of new thunks generated into the coreclr codebase. I expect that we'll build some sort of hardcoded list here for invokes to/from R2R code, and then have R2R supplement the list with extra cases.
• Adjust PortableEntryPoint calling convention to match the WASM version
• Update PortableEntryPoint::HasNativeEntryPoint to indicate that the NativeEntryPoint is the intentional target
• Update the calls from R2R into interpreter to capture the stack argument into the TransitionBlock
• Update all of the FCDECL/FCIMPL macros to capture the stack correctly
• Adjust the various FCalls which should capture a TransitionBlock to capture one from the callersStackPointer parameter to FCalls.
• Implement correct signature mapping for PortableEntryPoints which are FCalls
• Update interp to managed helpers to pass a stack pointer which informs the stack walker to stop walking
• Put the callers frame pointer into the TransitionBlock. To do so, I've added a new m_StackPointer field to the TransitionBlock
• Make the ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex function into functionally being the Prestub when called from R2R.
• Add m_StackPointer to TransitionBlock, and put the callers stack pointer in there.
• Update helper calls in interpexec to setup the stack pointer argument correctly

Fixes#123437

[dotnet-policy-service]

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

[Copilot]

Pull request overview

This PR updates CoreCLR’s WASM PortableEntryPoint and interpreter interop to support scenarios where R2R code calls through PortableEntryPoints that may ultimately target native entrypoints, including new thunk/signature handling and stack-walk termination plumbing.

Changes:

• Extend signature generation and thunk tables to distinguish PortableEntryPoint calls (via a 'p' suffix) and to include InternalCall/FCall shapes.
• Add/adjust WASM-side thunk implementations and runtime lookup/caching for R2R→interpreter and interpreter→native dispatch.
• Update PortableEntryPoint state tracking (preferring interpreter vs native) and propagate a stack-walk termination/stack pointer through TransitionBlock and helper call paths.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pregenerated signatures; writes cache as UTF-8.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct _PE call thunks for signatures ending in 'p' (PortableEntryPoint context).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans for MethodImplAttributes.InternalCall and emits 'p'-suffixed signatures.
src/coreclr/vm/wasm/helpers.cpp	Adds hardcoded R2R→interpreter thunks, PortableEntryPoint thunk cache, and signature key support for 'p' suffix.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated interpreter→native thunk implementations for PortableEntryPoint calls (*_PE) and signature table entries.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint-aware interpreted execution path that can run prestub work and dispatch to compiled code.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag and accessors.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint/SetActualCode semantics around “prefer interpreter” state.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoints with an optional R2R→interpreter thunk and marks them as preferring interpreter initially.
src/coreclr/vm/jithelpers.cpp	Updates WASM helper wrappers to pass stack-walk termination/TransitionBlock info into _Impl variants.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod prototype for PortableEntryPoint prestub dispatch use.
src/coreclr/vm/interpexec.cpp	Adds macros/typedefs to pass PortableEntryPoint stack/context args through helper calls; adjusts PortableEntryPoint native-entrypoint gating.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use GC flags instead of a bool.
src/coreclr/vm/frames.h	Changes GCFrame API from BOOL maybeInterior to UINT gcFlags and updates protection macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame behavior using gcFlags and asserts flag expectations.
src/coreclr/vm/fcall.h	Adjusts WASM FCALL/HCALL signatures to include hidden stack/context parameters.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock for WASM exception context.
src/coreclr/vm/eetwain.cpp	Ensures WASM TransitionBlock has stack pointer set for funclet calls.
src/coreclr/vm/callingconvention.h	Adds m_StackPointer overlay in WASM TransitionBlock.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates an internal FCALL-to-FCALL call site to pass the new WASM hidden parameters explicitly.

[Copilot]

Pull request overview

This PR updates the CoreCLR WASM PortableEntryPoint calling convention and thunk/signature infrastructure to support ReadyToRun (R2R) native entrypoints while preserving correct interpreter dispatch and stack-walking behavior.

Changes:

• Extends WASM signature generation to account for PortableEntryPoint context ('p') and InternalCall/FCall signature shapes.
• Adds R2R-to-interpreter thunk support, including capturing the caller stack pointer into TransitionBlock and using it to terminate/limit stack walking.
• Adjusts PortableEntryPoint state management and prestub-like behavior to correctly resolve interpreter vs native (R2R) targets.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this to signature mapping for instance methods.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Replaces icall table generation with InternalCall signature collection and adds pregenerated signature shapes.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct call thunks for PortableEntryPoint calls (extra hidden params + stack-walk termination).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New scanner to collect InternalCall signatures for thunk generation.
src/coreclr/vm/wasm/helpers.cpp	Adds R2R→interpreter thunk table/cache and updates managed calli invocation to carry PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates reverse-thunk exports and signature naming adjustments.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk table to include PE-aware signatures and call patterns.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves like prestub when invoked from R2R.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag/accessors and updates PortableEntryPoint API surface.
src/coreclr/vm/precode_portable.cpp	Updates native-entrypoint detection and allows “upgrade” from interpreter-preferred to actual code.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoint with an R2R→interpreter thunk when available and sets interpreter-preferred state.
src/coreclr/vm/jithelpers.cpp	WASM FCALL wrappers now pass stack pointer / transition info to exception helpers.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod for prestub/R2R dispatch paths.
src/coreclr/vm/interpexec.cpp	Adjusts helper calling patterns and PortableEntryPoint selection logic; threads stack-pointer through transition blocks.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to new ctor parameterization (gcFlags).
src/coreclr/vm/frames.h	Changes GCFrame API from maybeInterior to gcFlags and updates GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame gcFlags handling and enforces interior-flag expectations.
src/coreclr/vm/fcall.h	Updates FCALL/HCALL macro signatures for WASM to include hidden stack/context args.
src/coreclr/vm/excep.cpp	Plumbs interpreter stack pointer from TransitionBlock into exception frame context.
src/coreclr/vm/eetwain.cpp	Ensures WASM transition blocks set stack pointer consistently for funclet calls.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock to carry m_StackPointer.
src/coreclr/vm/callhelpers.h	Adds TERMINATE_R2R_STACK_WALK sentinel for WASM stack-walk termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates a FCALL wrapper to supply explicit hidden args under new WASM calling convention.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint plumbing to support ReadyToRun (R2R) native entrypoints and correct calling conventions/signature handling across interpreter ↔ native transitions (including FCalls), with additional stack-walk/TransitionBlock support.

Changes:

• Extend signature generation/mapping to support PortableEntryPoint context (p) and InternalCall (FCall) signatures; update thunk generation accordingly.
• Add initial hardcoded R2R→interpreter PortableEntryPoint thunk set and associated lookup/caching paths; adjust prestub-style dispatch for PortableEntryPoint calls.
• Update runtime structures/paths for WASM stack-walk termination and TransitionBlock stack pointer propagation; refactor GCFrame to use GC flag bitmasks.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection; adds pregenerated signature list.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct PE thunks (extra hidden params + stack-walk sentinel) and maps ...p signatures.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector for InternalCall method signatures (for PE thunk generation).
src/coreclr/vm/wasm/helpers.cpp	Adds PE thunk table + lookup; appends p to default-callconv signature keys; updates managed calli cookie invocation shape; adds thunk lookup for R2R→interp.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk implementations + table entries for ...p (PortableEntryPoint) signatures.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates generated reverse thunks and some signatures/entry mappings.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves prestub-like and can dispatch to R2R via InvokeManagedMethod.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag API to PortableEntryPoint.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and SetActualCode behavior with PrefersInterpreterEntryPoint.
src/coreclr/vm/method.cpp	Uses R2R→interp thunk when available and sets PrefersInterpreterEntryPoint on new PortableEntryPoints.
src/coreclr/vm/jithelpers.cpp	Updates WASM IL_Throw/IL_Rethrow/IL_ThrowExact wrappers to incorporate TransitionBlock/stack pointer logic.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration for new prestub path usage.
src/coreclr/vm/interpexec.cpp	Adds helper-call wrappers for WASM portable-entrypoint calling convention; updates PortableEntryPoint/native-entrypoint selection logic.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock storage with a unioned stack pointer field.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking.
src/coreclr/vm/frames.h	Updates GCFrame ctor signature (bool → flags) and adjusts GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame flag-based scanning behavior.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to pass GC flags.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint call later in IL stub creation.
src/coreclr/vm/fcall.h	Adjusts FCALL/HCALL signature macros for TARGET_WASM to include hidden params.
src/coreclr/vm/excep.cpp	Plumbs TransitionBlock stack pointer into SoftwareExceptionFrame context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer for WASM funclet path.
src/coreclr/runtime/portable/AllocFast.cpp	Updates RhpNewPtrArrayFast to match new WASM FCALL signature shape.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint / FCALL calling-convention plumbing to support scenarios where ReadyToRun (R2R) code has native entrypoints, including new/updated WASM thunk generation and TransitionBlock stack-pointer propagation.

Changes:

• Extend managed→native thunk signature generation to support PortableEntryPoint (“…p”) signatures and collect InternalCall shapes from System.Private.CoreLib.
• Add WASM-side thunk caches and interpreter dispatch paths to correctly pass PortableEntryPoint context and a stack-walk termination sentinel via TransitionBlock.
• Update FCALL/HCALL/GCFrame/PortableEntryPoint infrastructure to carry stack pointer state and prefer interpreter entrypoints until native code is available.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Add optional inclusion of this in signature encoding.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switch to InternalCall signature collection; add pregenerated PE signatures; UTF-8 cache write.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generate distinct PE thunk entrypoints and signatures with PE suffix handling.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New: scan CoreLib for InternalCall methods and emit PE thunk signatures.
src/coreclr/vm/wasm/helpers.hpp	New: startup init hook for wasm thunk caches.
src/coreclr/vm/wasm/helpers.cpp	Add PE thunk tables/caches; update calli cookie calling convention; init caches at startup.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Update reverse thunks/signatures to match new calling convention expectations.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Add “_PE” call thunks that pass PE context + stack-walk sentinel.
src/coreclr/vm/tailcallhelp.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/stubhelpers.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/runtimehandles.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/reflectioninvocation.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/prestub.cpp	Add PortableEntryPoint “complex” interpreter entry path behaving like prestub for R2R.
src/coreclr/vm/precode_portable.hpp	Add “prefers interpreter entrypoint” flag + APIs.
src/coreclr/vm/precode_portable.cpp	Adjust HasNativeEntryPoint logic; clear prefer-interpreter flag on upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Convert selected alloc helpers to FCIMPL + TransitionBlock-aware calling convention.
src/coreclr/vm/method.hpp	Add MethodDesc helper to initialize PE initial state.
src/coreclr/vm/method.cpp	Initialize/reset PE based on available PE→interp thunk; default to prefer-interpreter.
src/coreclr/vm/marshalnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/managedmdimport.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/jithelpers.cpp	WASM: build TransitionBlock for throw helpers using callersStackPointer sentinel logic.
src/coreclr/vm/interpexec.h	Expose InvokeManagedMethod for PortableEntryPoint prestub-like flow.
src/coreclr/vm/interpexec.cpp	Update helper-call sites to new calling convention; integrate prefer-interpreter logic.
src/coreclr/vm/ilstubcache.cpp	Move temporary entrypoint assignment after signature/flags setup.
src/coreclr/vm/gccover.cpp	Update GCFrame ctor usage to new gcFlags model.
src/coreclr/vm/frames.h	Replace maybeInterior bool with gcFlags.
src/coreclr/vm/frames.cpp	Implement gcFlags-based scanning behavior for GCFrame.
src/coreclr/vm/fcall.h	WASM: introduce wrapper/impl calling convention capture for callersStackPointer + PE context.
src/coreclr/vm/excep.cpp	Update TransitionBlock-derived interpreter context capture in exception frame.
src/coreclr/vm/eetwain.cpp	Ensure TransitionBlock stack pointer is initialized for WASM funclet calls.
src/coreclr/vm/ecall.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/dynamicmethod.cpp	Adjust contract mode + Reset ordering relative to signature/flags.
src/coreclr/vm/comutilnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comsynchronizable.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/commodule.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdependenthandle.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdelegate.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/ceemain.cpp	WASM: initialize thunk caches during EEStartup.
src/coreclr/vm/callingconvention.h	WASM: add m_StackPointer union member in TransitionBlock.
src/coreclr/vm/callhelpers.h	WASM: add TERMINATE_R2R_STACK_WALK sentinel definition.
src/coreclr/vm/assemblynative.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/arraynative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/runtime/portable/WriteBarriers.cpp	Convert write barrier stubs to FCIMPL for new WASM convention.
src/coreclr/runtime/portable/AllocFast.cpp	Add TransitionBlock-aware calling convention + helper macros; convert to FCIMPL.
src/coreclr/runtime/MiscNativeHelpers.h	Add PREPARE_TRANSITION_ARG helper for WASM/non-NativeAOT.

[radekdoulik]

I tried to run priority1 runtime tests and I see few failures. I will need to rerun it on main too, to see if it is introduced here or whether we regressed on main meanwhile. Doesn't need to block this PR though, we can fix it in a follow up PR. Just want to let you know.

Note for me: I should enable priority1 tests in the outer loop.

[radekdoulik]

LGTM, thank you!

[Copilot]

Pull request overview

This PR updates CoreCLR WASM portable entry point and FCall calling convention plumbing to support R2R/native entrypoints, including stack-pointer capture/propagation needed for correct transition handling and future stack walking on WASM. It also extends the WASM app builder codegen to generate (and pre-seed) additional thunk signatures, including InternalCall-driven portable entry point thunks.

Changes:

• Extend WASM thunk/signature generation to include InternalCall portable-entry-point shapes and pre-generated common signatures.
• Add WASM runtime support for portable-entry-point → interpreter thunks, thunk caches, and updated calli cookie invocation.
• Update portable entry point state/flags and transition block handling to carry a stack pointer, plus broad FCDECL/FCIMPL macro/call-site adjustments for the WASM ABI.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Allows optional inclusion of this in generated signatures (used for InternalCall scanning).
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pre-generated PE signatures.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates separate thunk entrypoints for portable entry point calls (extra hidden context + frame-pointer arg).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans System.Private.CoreLib InternalCalls and emits PE signatures.
src/coreclr/vm/wasm/helpers.hpp	Declares InitializeWasmThunkCaches for explicit EEStartup initialization.
src/coreclr/vm/wasm/helpers.cpp	Adds PE→interpreter thunk table/caches, updates thunk lookup/init, and adjusts calli invocation to pass PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates/renames some reverse thunks and signatures to align with updated calling convention shapes.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Adds PE-specific thunk entrypoints (extra frame-pointer + PE context) and updates thunk map keys.
src/coreclr/vm/tailcallhelp.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/stubhelpers.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/runtimehandles.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/reflectioninvocation.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path to act like prestub for R2R vs interpreter dispatch on WASM.
src/coreclr/vm/precode_portable.hpp	Adds “prefers interpreter entry point” flag and API surface.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and clears the “prefer interpreter” flag on code upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Updates allocator FCALLs to capture/pass a transition block under the new WASM calling convention.
src/coreclr/vm/method.hpp	Adds helper to initialize portable entry point state based on method characteristics.
src/coreclr/vm/method.cpp	Initializes portable entry points with optional PE→interp thunk and sets initial “prefer interpreter” state.
src/coreclr/vm/marshalnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/managedmdimport.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/jithelpers.cpp	Adjusts WASM FCALL wrappers to provide TransitionBlock context based on callers’ stack pointer sentinel.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration needed by new prestub-like PE path.
src/coreclr/vm/interpexec.cpp	Updates helper call patterns for PE ABI (frame-pointer + hidden args) and PE/native-entrypoint preference logic.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later to ensure dynamic method state is initialized first.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use flag-based interior tracking.
src/coreclr/vm/frames.h	Changes GCFrame ctor signature (flags instead of bool) and updates GCPROTECT macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame flag storage/scanning semantics and asserts correct interior-flag usage.
src/coreclr/vm/fcall.h	Adds WASM FCALL ABI support (hidden callersStackPointer + PE context) and wrapper generation macros.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock into exception context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer in WASM funclet path.
src/coreclr/vm/ecall.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/dynamicmethod.cpp	Adjusts contract mode and reorders Reset() to occur after signature/flags are set (WASM needs signature inspection).
src/coreclr/vm/comutilnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comsynchronizable.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/commodule.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdependenthandle.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdelegate.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/ceemain.cpp	Calls InitializeWasmThunkCaches() during EE startup on WASM.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock layout to carry a stack pointer (union overlay).
src/coreclr/vm/callhelpers.h	Adds WASM sentinel TERMINATE_R2R_STACK_WALK for stack-walk termination.
src/coreclr/vm/assemblynative.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/arraynative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/runtime/portable/WriteBarriers.cpp	Wraps portable write barrier stubs in FCIMPL for updated FCALL handling.
src/coreclr/runtime/portable/AllocFast.cpp	Updates fast alloc helpers to prepare/pass transition args (TransitionBlock) under the WASM ABI.
src/coreclr/runtime/MiscNativeHelpers.h	Adds WASM helper macros for preparing/passing TransitionBlock based on callersStackPointer sentinel.

[pavelsavara]

This breaks CI ☹️ (it's in-tree coreCLR)

Log

D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:22:5: error: unknown type name 'NOINLINE'
22 | NOINLINE static void CallFunc_F64_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:24:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:29:5: error: unknown type name 'NOINLINE'
29 | NOINLINE static void CallFunc_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:31:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
31 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:36:5: error: unknown type name 'NOINLINE'
36 | NOINLINE static void CallFunc_F64_I32_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:38:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
38 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^

[radekdoulik]

Indeed, it was masked by known build issue

#127177 should fix it

[davidwrighton]

• This includes some initial work where there is a predefined set of new thunks generated into the coreclr codebase. I expect that we'll build some sort of hardcoded list here for invokes to/from R2R code, and then have R2R supplement the list with extra cases.
• Adjust PortableEntryPoint calling convention to match the WASM version
• Update PortableEntryPoint::HasNativeEntryPoint to indicate that the NativeEntryPoint is the intentional target
• Update the calls from R2R into interpreter to capture the stack argument into the TransitionBlock
• Update all of the FCDECL/FCIMPL macros to capture the stack correctly
• Adjust the various FCalls which should capture a TransitionBlock to capture one from the callersStackPointer parameter to FCalls.
• Implement correct signature mapping for PortableEntryPoints which are FCalls
• Update interp to managed helpers to pass a stack pointer which informs the stack walker to stop walking
• Put the callers frame pointer into the TransitionBlock. To do so, I've added a new m_StackPointer field to the TransitionBlock
• Make the ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex function into functionally being the Prestub when called from R2R.
• Add m_StackPointer to TransitionBlock, and put the callers stack pointer in there.
• Update helper calls in interpexec to setup the stack pointer argument correctly

Fixes#123437

[dotnet-policy-service]

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

[Copilot]

Pull request overview

This PR updates CoreCLR’s WASM PortableEntryPoint and interpreter interop to support scenarios where R2R code calls through PortableEntryPoints that may ultimately target native entrypoints, including new thunk/signature handling and stack-walk termination plumbing.

Changes:

• Extend signature generation and thunk tables to distinguish PortableEntryPoint calls (via a 'p' suffix) and to include InternalCall/FCall shapes.
• Add/adjust WASM-side thunk implementations and runtime lookup/caching for R2R→interpreter and interpreter→native dispatch.
• Update PortableEntryPoint state tracking (preferring interpreter vs native) and propagate a stack-walk termination/stack pointer through TransitionBlock and helper call paths.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pregenerated signatures; writes cache as UTF-8.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct _PE call thunks for signatures ending in 'p' (PortableEntryPoint context).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans for MethodImplAttributes.InternalCall and emits 'p'-suffixed signatures.
src/coreclr/vm/wasm/helpers.cpp	Adds hardcoded R2R→interpreter thunks, PortableEntryPoint thunk cache, and signature key support for 'p' suffix.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated interpreter→native thunk implementations for PortableEntryPoint calls (*_PE) and signature table entries.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint-aware interpreted execution path that can run prestub work and dispatch to compiled code.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag and accessors.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint/SetActualCode semantics around “prefer interpreter” state.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoints with an optional R2R→interpreter thunk and marks them as preferring interpreter initially.
src/coreclr/vm/jithelpers.cpp	Updates WASM helper wrappers to pass stack-walk termination/TransitionBlock info into _Impl variants.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod prototype for PortableEntryPoint prestub dispatch use.
src/coreclr/vm/interpexec.cpp	Adds macros/typedefs to pass PortableEntryPoint stack/context args through helper calls; adjusts PortableEntryPoint native-entrypoint gating.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use GC flags instead of a bool.
src/coreclr/vm/frames.h	Changes GCFrame API from BOOL maybeInterior to UINT gcFlags and updates protection macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame behavior using gcFlags and asserts flag expectations.
src/coreclr/vm/fcall.h	Adjusts WASM FCALL/HCALL signatures to include hidden stack/context parameters.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock for WASM exception context.
src/coreclr/vm/eetwain.cpp	Ensures WASM TransitionBlock has stack pointer set for funclet calls.
src/coreclr/vm/callingconvention.h	Adds m_StackPointer overlay in WASM TransitionBlock.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates an internal FCALL-to-FCALL call site to pass the new WASM hidden parameters explicitly.

[Copilot]

Pull request overview

This PR updates the CoreCLR WASM PortableEntryPoint calling convention and thunk/signature infrastructure to support ReadyToRun (R2R) native entrypoints while preserving correct interpreter dispatch and stack-walking behavior.

Changes:

• Extends WASM signature generation to account for PortableEntryPoint context ('p') and InternalCall/FCall signature shapes.
• Adds R2R-to-interpreter thunk support, including capturing the caller stack pointer into TransitionBlock and using it to terminate/limit stack walking.
• Adjusts PortableEntryPoint state management and prestub-like behavior to correctly resolve interpreter vs native (R2R) targets.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this to signature mapping for instance methods.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Replaces icall table generation with InternalCall signature collection and adds pregenerated signature shapes.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct call thunks for PortableEntryPoint calls (extra hidden params + stack-walk termination).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New scanner to collect InternalCall signatures for thunk generation.
src/coreclr/vm/wasm/helpers.cpp	Adds R2R→interpreter thunk table/cache and updates managed calli invocation to carry PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates reverse-thunk exports and signature naming adjustments.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk table to include PE-aware signatures and call patterns.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves like prestub when invoked from R2R.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag/accessors and updates PortableEntryPoint API surface.
src/coreclr/vm/precode_portable.cpp	Updates native-entrypoint detection and allows “upgrade” from interpreter-preferred to actual code.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoint with an R2R→interpreter thunk when available and sets interpreter-preferred state.
src/coreclr/vm/jithelpers.cpp	WASM FCALL wrappers now pass stack pointer / transition info to exception helpers.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod for prestub/R2R dispatch paths.
src/coreclr/vm/interpexec.cpp	Adjusts helper calling patterns and PortableEntryPoint selection logic; threads stack-pointer through transition blocks.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to new ctor parameterization (gcFlags).
src/coreclr/vm/frames.h	Changes GCFrame API from maybeInterior to gcFlags and updates GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame gcFlags handling and enforces interior-flag expectations.
src/coreclr/vm/fcall.h	Updates FCALL/HCALL macro signatures for WASM to include hidden stack/context args.
src/coreclr/vm/excep.cpp	Plumbs interpreter stack pointer from TransitionBlock into exception frame context.
src/coreclr/vm/eetwain.cpp	Ensures WASM transition blocks set stack pointer consistently for funclet calls.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock to carry m_StackPointer.
src/coreclr/vm/callhelpers.h	Adds TERMINATE_R2R_STACK_WALK sentinel for WASM stack-walk termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates a FCALL wrapper to supply explicit hidden args under new WASM calling convention.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint plumbing to support ReadyToRun (R2R) native entrypoints and correct calling conventions/signature handling across interpreter ↔ native transitions (including FCalls), with additional stack-walk/TransitionBlock support.

Changes:

• Extend signature generation/mapping to support PortableEntryPoint context (p) and InternalCall (FCall) signatures; update thunk generation accordingly.
• Add initial hardcoded R2R→interpreter PortableEntryPoint thunk set and associated lookup/caching paths; adjust prestub-style dispatch for PortableEntryPoint calls.
• Update runtime structures/paths for WASM stack-walk termination and TransitionBlock stack pointer propagation; refactor GCFrame to use GC flag bitmasks.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection; adds pregenerated signature list.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct PE thunks (extra hidden params + stack-walk sentinel) and maps ...p signatures.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector for InternalCall method signatures (for PE thunk generation).
src/coreclr/vm/wasm/helpers.cpp	Adds PE thunk table + lookup; appends p to default-callconv signature keys; updates managed calli cookie invocation shape; adds thunk lookup for R2R→interp.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk implementations + table entries for ...p (PortableEntryPoint) signatures.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates generated reverse thunks and some signatures/entry mappings.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves prestub-like and can dispatch to R2R via InvokeManagedMethod.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag API to PortableEntryPoint.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and SetActualCode behavior with PrefersInterpreterEntryPoint.
src/coreclr/vm/method.cpp	Uses R2R→interp thunk when available and sets PrefersInterpreterEntryPoint on new PortableEntryPoints.
src/coreclr/vm/jithelpers.cpp	Updates WASM IL_Throw/IL_Rethrow/IL_ThrowExact wrappers to incorporate TransitionBlock/stack pointer logic.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration for new prestub path usage.
src/coreclr/vm/interpexec.cpp	Adds helper-call wrappers for WASM portable-entrypoint calling convention; updates PortableEntryPoint/native-entrypoint selection logic.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock storage with a unioned stack pointer field.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking.
src/coreclr/vm/frames.h	Updates GCFrame ctor signature (bool → flags) and adjusts GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame flag-based scanning behavior.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to pass GC flags.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint call later in IL stub creation.
src/coreclr/vm/fcall.h	Adjusts FCALL/HCALL signature macros for TARGET_WASM to include hidden params.
src/coreclr/vm/excep.cpp	Plumbs TransitionBlock stack pointer into SoftwareExceptionFrame context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer for WASM funclet path.
src/coreclr/runtime/portable/AllocFast.cpp	Updates RhpNewPtrArrayFast to match new WASM FCALL signature shape.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint / FCALL calling-convention plumbing to support scenarios where ReadyToRun (R2R) code has native entrypoints, including new/updated WASM thunk generation and TransitionBlock stack-pointer propagation.

Changes:

• Extend managed→native thunk signature generation to support PortableEntryPoint (“…p”) signatures and collect InternalCall shapes from System.Private.CoreLib.
• Add WASM-side thunk caches and interpreter dispatch paths to correctly pass PortableEntryPoint context and a stack-walk termination sentinel via TransitionBlock.
• Update FCALL/HCALL/GCFrame/PortableEntryPoint infrastructure to carry stack pointer state and prefer interpreter entrypoints until native code is available.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Add optional inclusion of this in signature encoding.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switch to InternalCall signature collection; add pregenerated PE signatures; UTF-8 cache write.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generate distinct PE thunk entrypoints and signatures with PE suffix handling.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New: scan CoreLib for InternalCall methods and emit PE thunk signatures.
src/coreclr/vm/wasm/helpers.hpp	New: startup init hook for wasm thunk caches.
src/coreclr/vm/wasm/helpers.cpp	Add PE thunk tables/caches; update calli cookie calling convention; init caches at startup.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Update reverse thunks/signatures to match new calling convention expectations.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Add “_PE” call thunks that pass PE context + stack-walk sentinel.
src/coreclr/vm/tailcallhelp.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/stubhelpers.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/runtimehandles.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/reflectioninvocation.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/prestub.cpp	Add PortableEntryPoint “complex” interpreter entry path behaving like prestub for R2R.
src/coreclr/vm/precode_portable.hpp	Add “prefers interpreter entrypoint” flag + APIs.
src/coreclr/vm/precode_portable.cpp	Adjust HasNativeEntryPoint logic; clear prefer-interpreter flag on upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Convert selected alloc helpers to FCIMPL + TransitionBlock-aware calling convention.
src/coreclr/vm/method.hpp	Add MethodDesc helper to initialize PE initial state.
src/coreclr/vm/method.cpp	Initialize/reset PE based on available PE→interp thunk; default to prefer-interpreter.
src/coreclr/vm/marshalnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/managedmdimport.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/jithelpers.cpp	WASM: build TransitionBlock for throw helpers using callersStackPointer sentinel logic.
src/coreclr/vm/interpexec.h	Expose InvokeManagedMethod for PortableEntryPoint prestub-like flow.
src/coreclr/vm/interpexec.cpp	Update helper-call sites to new calling convention; integrate prefer-interpreter logic.
src/coreclr/vm/ilstubcache.cpp	Move temporary entrypoint assignment after signature/flags setup.
src/coreclr/vm/gccover.cpp	Update GCFrame ctor usage to new gcFlags model.
src/coreclr/vm/frames.h	Replace maybeInterior bool with gcFlags.
src/coreclr/vm/frames.cpp	Implement gcFlags-based scanning behavior for GCFrame.
src/coreclr/vm/fcall.h	WASM: introduce wrapper/impl calling convention capture for callersStackPointer + PE context.
src/coreclr/vm/excep.cpp	Update TransitionBlock-derived interpreter context capture in exception frame.
src/coreclr/vm/eetwain.cpp	Ensure TransitionBlock stack pointer is initialized for WASM funclet calls.
src/coreclr/vm/ecall.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/dynamicmethod.cpp	Adjust contract mode + Reset ordering relative to signature/flags.
src/coreclr/vm/comutilnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comsynchronizable.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/commodule.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdependenthandle.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdelegate.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/ceemain.cpp	WASM: initialize thunk caches during EEStartup.
src/coreclr/vm/callingconvention.h	WASM: add m_StackPointer union member in TransitionBlock.
src/coreclr/vm/callhelpers.h	WASM: add TERMINATE_R2R_STACK_WALK sentinel definition.
src/coreclr/vm/assemblynative.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/arraynative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/runtime/portable/WriteBarriers.cpp	Convert write barrier stubs to FCIMPL for new WASM convention.
src/coreclr/runtime/portable/AllocFast.cpp	Add TransitionBlock-aware calling convention + helper macros; convert to FCIMPL.
src/coreclr/runtime/MiscNativeHelpers.h	Add PREPARE_TRANSITION_ARG helper for WASM/non-NativeAOT.

[radekdoulik]

I tried to run priority1 runtime tests and I see few failures. I will need to rerun it on main too, to see if it is introduced here or whether we regressed on main meanwhile. Doesn't need to block this PR though, we can fix it in a follow up PR. Just want to let you know.

Note for me: I should enable priority1 tests in the outer loop.

[radekdoulik]

LGTM, thank you!

[Copilot]

Pull request overview

This PR updates CoreCLR WASM portable entry point and FCall calling convention plumbing to support R2R/native entrypoints, including stack-pointer capture/propagation needed for correct transition handling and future stack walking on WASM. It also extends the WASM app builder codegen to generate (and pre-seed) additional thunk signatures, including InternalCall-driven portable entry point thunks.

Changes:

• Extend WASM thunk/signature generation to include InternalCall portable-entry-point shapes and pre-generated common signatures.
• Add WASM runtime support for portable-entry-point → interpreter thunks, thunk caches, and updated calli cookie invocation.
• Update portable entry point state/flags and transition block handling to carry a stack pointer, plus broad FCDECL/FCIMPL macro/call-site adjustments for the WASM ABI.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Allows optional inclusion of this in generated signatures (used for InternalCall scanning).
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pre-generated PE signatures.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates separate thunk entrypoints for portable entry point calls (extra hidden context + frame-pointer arg).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans System.Private.CoreLib InternalCalls and emits PE signatures.
src/coreclr/vm/wasm/helpers.hpp	Declares InitializeWasmThunkCaches for explicit EEStartup initialization.
src/coreclr/vm/wasm/helpers.cpp	Adds PE→interpreter thunk table/caches, updates thunk lookup/init, and adjusts calli invocation to pass PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates/renames some reverse thunks and signatures to align with updated calling convention shapes.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Adds PE-specific thunk entrypoints (extra frame-pointer + PE context) and updates thunk map keys.
src/coreclr/vm/tailcallhelp.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/stubhelpers.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/runtimehandles.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/reflectioninvocation.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path to act like prestub for R2R vs interpreter dispatch on WASM.
src/coreclr/vm/precode_portable.hpp	Adds “prefers interpreter entry point” flag and API surface.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and clears the “prefer interpreter” flag on code upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Updates allocator FCALLs to capture/pass a transition block under the new WASM calling convention.
src/coreclr/vm/method.hpp	Adds helper to initialize portable entry point state based on method characteristics.
src/coreclr/vm/method.cpp	Initializes portable entry points with optional PE→interp thunk and sets initial “prefer interpreter” state.
src/coreclr/vm/marshalnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/managedmdimport.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/jithelpers.cpp	Adjusts WASM FCALL wrappers to provide TransitionBlock context based on callers’ stack pointer sentinel.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration needed by new prestub-like PE path.
src/coreclr/vm/interpexec.cpp	Updates helper call patterns for PE ABI (frame-pointer + hidden args) and PE/native-entrypoint preference logic.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later to ensure dynamic method state is initialized first.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use flag-based interior tracking.
src/coreclr/vm/frames.h	Changes GCFrame ctor signature (flags instead of bool) and updates GCPROTECT macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame flag storage/scanning semantics and asserts correct interior-flag usage.
src/coreclr/vm/fcall.h	Adds WASM FCALL ABI support (hidden callersStackPointer + PE context) and wrapper generation macros.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock into exception context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer in WASM funclet path.
src/coreclr/vm/ecall.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/dynamicmethod.cpp	Adjusts contract mode and reorders Reset() to occur after signature/flags are set (WASM needs signature inspection).
src/coreclr/vm/comutilnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comsynchronizable.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/commodule.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdependenthandle.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdelegate.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/ceemain.cpp	Calls InitializeWasmThunkCaches() during EE startup on WASM.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock layout to carry a stack pointer (union overlay).
src/coreclr/vm/callhelpers.h	Adds WASM sentinel TERMINATE_R2R_STACK_WALK for stack-walk termination.
src/coreclr/vm/assemblynative.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/arraynative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/runtime/portable/WriteBarriers.cpp	Wraps portable write barrier stubs in FCIMPL for updated FCALL handling.
src/coreclr/runtime/portable/AllocFast.cpp	Updates fast alloc helpers to prepare/pass transition args (TransitionBlock) under the WASM ABI.
src/coreclr/runtime/MiscNativeHelpers.h	Adds WASM helper macros for preparing/passing TransitionBlock based on callersStackPointer sentinel.

[pavelsavara]

This breaks CI ☹️ (it's in-tree coreCLR)

Log

D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:22:5: error: unknown type name 'NOINLINE'
22 | NOINLINE static void CallFunc_F64_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:24:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:29:5: error: unknown type name 'NOINLINE'
29 | NOINLINE static void CallFunc_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:31:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
31 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:36:5: error: unknown type name 'NOINLINE'
36 | NOINLINE static void CallFunc_F64_I32_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:38:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
38 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^

[radekdoulik]

Indeed, it was masked by known build issue

#127177 should fix it

[davidwrighton]

• This includes some initial work where there is a predefined set of new thunks generated into the coreclr codebase. I expect that we'll build some sort of hardcoded list here for invokes to/from R2R code, and then have R2R supplement the list with extra cases.
• Adjust PortableEntryPoint calling convention to match the WASM version
• Update PortableEntryPoint::HasNativeEntryPoint to indicate that the NativeEntryPoint is the intentional target
• Update the calls from R2R into interpreter to capture the stack argument into the TransitionBlock
• Update all of the FCDECL/FCIMPL macros to capture the stack correctly
• Adjust the various FCalls which should capture a TransitionBlock to capture one from the callersStackPointer parameter to FCalls.
• Implement correct signature mapping for PortableEntryPoints which are FCalls
• Update interp to managed helpers to pass a stack pointer which informs the stack walker to stop walking
• Put the callers frame pointer into the TransitionBlock. To do so, I've added a new m_StackPointer field to the TransitionBlock
• Make the ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex function into functionally being the Prestub when called from R2R.
• Add m_StackPointer to TransitionBlock, and put the callers stack pointer in there.
• Update helper calls in interpexec to setup the stack pointer argument correctly

Fixes#123437

[dotnet-policy-service]

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

[Copilot]

Pull request overview

This PR updates CoreCLR’s WASM PortableEntryPoint and interpreter interop to support scenarios where R2R code calls through PortableEntryPoints that may ultimately target native entrypoints, including new thunk/signature handling and stack-walk termination plumbing.

Changes:

• Extend signature generation and thunk tables to distinguish PortableEntryPoint calls (via a 'p' suffix) and to include InternalCall/FCall shapes.
• Add/adjust WASM-side thunk implementations and runtime lookup/caching for R2R→interpreter and interpreter→native dispatch.
• Update PortableEntryPoint state tracking (preferring interpreter vs native) and propagate a stack-walk termination/stack pointer through TransitionBlock and helper call paths.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pregenerated signatures; writes cache as UTF-8.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct _PE call thunks for signatures ending in 'p' (PortableEntryPoint context).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans for MethodImplAttributes.InternalCall and emits 'p'-suffixed signatures.
src/coreclr/vm/wasm/helpers.cpp	Adds hardcoded R2R→interpreter thunks, PortableEntryPoint thunk cache, and signature key support for 'p' suffix.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated interpreter→native thunk implementations for PortableEntryPoint calls (*_PE) and signature table entries.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint-aware interpreted execution path that can run prestub work and dispatch to compiled code.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag and accessors.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint/SetActualCode semantics around “prefer interpreter” state.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoints with an optional R2R→interpreter thunk and marks them as preferring interpreter initially.
src/coreclr/vm/jithelpers.cpp	Updates WASM helper wrappers to pass stack-walk termination/TransitionBlock info into _Impl variants.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod prototype for PortableEntryPoint prestub dispatch use.
src/coreclr/vm/interpexec.cpp	Adds macros/typedefs to pass PortableEntryPoint stack/context args through helper calls; adjusts PortableEntryPoint native-entrypoint gating.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use GC flags instead of a bool.
src/coreclr/vm/frames.h	Changes GCFrame API from BOOL maybeInterior to UINT gcFlags and updates protection macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame behavior using gcFlags and asserts flag expectations.
src/coreclr/vm/fcall.h	Adjusts WASM FCALL/HCALL signatures to include hidden stack/context parameters.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock for WASM exception context.
src/coreclr/vm/eetwain.cpp	Ensures WASM TransitionBlock has stack pointer set for funclet calls.
src/coreclr/vm/callingconvention.h	Adds m_StackPointer overlay in WASM TransitionBlock.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates an internal FCALL-to-FCALL call site to pass the new WASM hidden parameters explicitly.

[Copilot]

Pull request overview

This PR updates the CoreCLR WASM PortableEntryPoint calling convention and thunk/signature infrastructure to support ReadyToRun (R2R) native entrypoints while preserving correct interpreter dispatch and stack-walking behavior.

Changes:

• Extends WASM signature generation to account for PortableEntryPoint context ('p') and InternalCall/FCall signature shapes.
• Adds R2R-to-interpreter thunk support, including capturing the caller stack pointer into TransitionBlock and using it to terminate/limit stack walking.
• Adjusts PortableEntryPoint state management and prestub-like behavior to correctly resolve interpreter vs native (R2R) targets.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this to signature mapping for instance methods.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Replaces icall table generation with InternalCall signature collection and adds pregenerated signature shapes.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct call thunks for PortableEntryPoint calls (extra hidden params + stack-walk termination).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New scanner to collect InternalCall signatures for thunk generation.
src/coreclr/vm/wasm/helpers.cpp	Adds R2R→interpreter thunk table/cache and updates managed calli invocation to carry PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates reverse-thunk exports and signature naming adjustments.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk table to include PE-aware signatures and call patterns.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves like prestub when invoked from R2R.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag/accessors and updates PortableEntryPoint API surface.
src/coreclr/vm/precode_portable.cpp	Updates native-entrypoint detection and allows “upgrade” from interpreter-preferred to actual code.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoint with an R2R→interpreter thunk when available and sets interpreter-preferred state.
src/coreclr/vm/jithelpers.cpp	WASM FCALL wrappers now pass stack pointer / transition info to exception helpers.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod for prestub/R2R dispatch paths.
src/coreclr/vm/interpexec.cpp	Adjusts helper calling patterns and PortableEntryPoint selection logic; threads stack-pointer through transition blocks.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to new ctor parameterization (gcFlags).
src/coreclr/vm/frames.h	Changes GCFrame API from maybeInterior to gcFlags and updates GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame gcFlags handling and enforces interior-flag expectations.
src/coreclr/vm/fcall.h	Updates FCALL/HCALL macro signatures for WASM to include hidden stack/context args.
src/coreclr/vm/excep.cpp	Plumbs interpreter stack pointer from TransitionBlock into exception frame context.
src/coreclr/vm/eetwain.cpp	Ensures WASM transition blocks set stack pointer consistently for funclet calls.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock to carry m_StackPointer.
src/coreclr/vm/callhelpers.h	Adds TERMINATE_R2R_STACK_WALK sentinel for WASM stack-walk termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates a FCALL wrapper to supply explicit hidden args under new WASM calling convention.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint plumbing to support ReadyToRun (R2R) native entrypoints and correct calling conventions/signature handling across interpreter ↔ native transitions (including FCalls), with additional stack-walk/TransitionBlock support.

Changes:

• Extend signature generation/mapping to support PortableEntryPoint context (p) and InternalCall (FCall) signatures; update thunk generation accordingly.
• Add initial hardcoded R2R→interpreter PortableEntryPoint thunk set and associated lookup/caching paths; adjust prestub-style dispatch for PortableEntryPoint calls.
• Update runtime structures/paths for WASM stack-walk termination and TransitionBlock stack pointer propagation; refactor GCFrame to use GC flag bitmasks.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection; adds pregenerated signature list.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct PE thunks (extra hidden params + stack-walk sentinel) and maps ...p signatures.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector for InternalCall method signatures (for PE thunk generation).
src/coreclr/vm/wasm/helpers.cpp	Adds PE thunk table + lookup; appends p to default-callconv signature keys; updates managed calli cookie invocation shape; adds thunk lookup for R2R→interp.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk implementations + table entries for ...p (PortableEntryPoint) signatures.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates generated reverse thunks and some signatures/entry mappings.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves prestub-like and can dispatch to R2R via InvokeManagedMethod.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag API to PortableEntryPoint.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and SetActualCode behavior with PrefersInterpreterEntryPoint.
src/coreclr/vm/method.cpp	Uses R2R→interp thunk when available and sets PrefersInterpreterEntryPoint on new PortableEntryPoints.
src/coreclr/vm/jithelpers.cpp	Updates WASM IL_Throw/IL_Rethrow/IL_ThrowExact wrappers to incorporate TransitionBlock/stack pointer logic.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration for new prestub path usage.
src/coreclr/vm/interpexec.cpp	Adds helper-call wrappers for WASM portable-entrypoint calling convention; updates PortableEntryPoint/native-entrypoint selection logic.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock storage with a unioned stack pointer field.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking.
src/coreclr/vm/frames.h	Updates GCFrame ctor signature (bool → flags) and adjusts GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame flag-based scanning behavior.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to pass GC flags.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint call later in IL stub creation.
src/coreclr/vm/fcall.h	Adjusts FCALL/HCALL signature macros for TARGET_WASM to include hidden params.
src/coreclr/vm/excep.cpp	Plumbs TransitionBlock stack pointer into SoftwareExceptionFrame context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer for WASM funclet path.
src/coreclr/runtime/portable/AllocFast.cpp	Updates RhpNewPtrArrayFast to match new WASM FCALL signature shape.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint / FCALL calling-convention plumbing to support scenarios where ReadyToRun (R2R) code has native entrypoints, including new/updated WASM thunk generation and TransitionBlock stack-pointer propagation.

Changes:

• Extend managed→native thunk signature generation to support PortableEntryPoint (“…p”) signatures and collect InternalCall shapes from System.Private.CoreLib.
• Add WASM-side thunk caches and interpreter dispatch paths to correctly pass PortableEntryPoint context and a stack-walk termination sentinel via TransitionBlock.
• Update FCALL/HCALL/GCFrame/PortableEntryPoint infrastructure to carry stack pointer state and prefer interpreter entrypoints until native code is available.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Add optional inclusion of this in signature encoding.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switch to InternalCall signature collection; add pregenerated PE signatures; UTF-8 cache write.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generate distinct PE thunk entrypoints and signatures with PE suffix handling.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New: scan CoreLib for InternalCall methods and emit PE thunk signatures.
src/coreclr/vm/wasm/helpers.hpp	New: startup init hook for wasm thunk caches.
src/coreclr/vm/wasm/helpers.cpp	Add PE thunk tables/caches; update calli cookie calling convention; init caches at startup.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Update reverse thunks/signatures to match new calling convention expectations.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Add “_PE” call thunks that pass PE context + stack-walk sentinel.
src/coreclr/vm/tailcallhelp.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/stubhelpers.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/runtimehandles.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/reflectioninvocation.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/prestub.cpp	Add PortableEntryPoint “complex” interpreter entry path behaving like prestub for R2R.
src/coreclr/vm/precode_portable.hpp	Add “prefers interpreter entrypoint” flag + APIs.
src/coreclr/vm/precode_portable.cpp	Adjust HasNativeEntryPoint logic; clear prefer-interpreter flag on upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Convert selected alloc helpers to FCIMPL + TransitionBlock-aware calling convention.
src/coreclr/vm/method.hpp	Add MethodDesc helper to initialize PE initial state.
src/coreclr/vm/method.cpp	Initialize/reset PE based on available PE→interp thunk; default to prefer-interpreter.
src/coreclr/vm/marshalnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/managedmdimport.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/jithelpers.cpp	WASM: build TransitionBlock for throw helpers using callersStackPointer sentinel logic.
src/coreclr/vm/interpexec.h	Expose InvokeManagedMethod for PortableEntryPoint prestub-like flow.
src/coreclr/vm/interpexec.cpp	Update helper-call sites to new calling convention; integrate prefer-interpreter logic.
src/coreclr/vm/ilstubcache.cpp	Move temporary entrypoint assignment after signature/flags setup.
src/coreclr/vm/gccover.cpp	Update GCFrame ctor usage to new gcFlags model.
src/coreclr/vm/frames.h	Replace maybeInterior bool with gcFlags.
src/coreclr/vm/frames.cpp	Implement gcFlags-based scanning behavior for GCFrame.
src/coreclr/vm/fcall.h	WASM: introduce wrapper/impl calling convention capture for callersStackPointer + PE context.
src/coreclr/vm/excep.cpp	Update TransitionBlock-derived interpreter context capture in exception frame.
src/coreclr/vm/eetwain.cpp	Ensure TransitionBlock stack pointer is initialized for WASM funclet calls.
src/coreclr/vm/ecall.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/dynamicmethod.cpp	Adjust contract mode + Reset ordering relative to signature/flags.
src/coreclr/vm/comutilnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comsynchronizable.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/commodule.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdependenthandle.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdelegate.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/ceemain.cpp	WASM: initialize thunk caches during EEStartup.
src/coreclr/vm/callingconvention.h	WASM: add m_StackPointer union member in TransitionBlock.
src/coreclr/vm/callhelpers.h	WASM: add TERMINATE_R2R_STACK_WALK sentinel definition.
src/coreclr/vm/assemblynative.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/arraynative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/runtime/portable/WriteBarriers.cpp	Convert write barrier stubs to FCIMPL for new WASM convention.
src/coreclr/runtime/portable/AllocFast.cpp	Add TransitionBlock-aware calling convention + helper macros; convert to FCIMPL.
src/coreclr/runtime/MiscNativeHelpers.h	Add PREPARE_TRANSITION_ARG helper for WASM/non-NativeAOT.

[radekdoulik]

I tried to run priority1 runtime tests and I see few failures. I will need to rerun it on main too, to see if it is introduced here or whether we regressed on main meanwhile. Doesn't need to block this PR though, we can fix it in a follow up PR. Just want to let you know.

Note for me: I should enable priority1 tests in the outer loop.

[radekdoulik]

LGTM, thank you!

[Copilot]

Pull request overview

This PR updates CoreCLR WASM portable entry point and FCall calling convention plumbing to support R2R/native entrypoints, including stack-pointer capture/propagation needed for correct transition handling and future stack walking on WASM. It also extends the WASM app builder codegen to generate (and pre-seed) additional thunk signatures, including InternalCall-driven portable entry point thunks.

Changes:

• Extend WASM thunk/signature generation to include InternalCall portable-entry-point shapes and pre-generated common signatures.
• Add WASM runtime support for portable-entry-point → interpreter thunks, thunk caches, and updated calli cookie invocation.
• Update portable entry point state/flags and transition block handling to carry a stack pointer, plus broad FCDECL/FCIMPL macro/call-site adjustments for the WASM ABI.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Allows optional inclusion of this in generated signatures (used for InternalCall scanning).
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pre-generated PE signatures.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates separate thunk entrypoints for portable entry point calls (extra hidden context + frame-pointer arg).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans System.Private.CoreLib InternalCalls and emits PE signatures.
src/coreclr/vm/wasm/helpers.hpp	Declares InitializeWasmThunkCaches for explicit EEStartup initialization.
src/coreclr/vm/wasm/helpers.cpp	Adds PE→interpreter thunk table/caches, updates thunk lookup/init, and adjusts calli invocation to pass PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates/renames some reverse thunks and signatures to align with updated calling convention shapes.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Adds PE-specific thunk entrypoints (extra frame-pointer + PE context) and updates thunk map keys.
src/coreclr/vm/tailcallhelp.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/stubhelpers.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/runtimehandles.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/reflectioninvocation.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path to act like prestub for R2R vs interpreter dispatch on WASM.
src/coreclr/vm/precode_portable.hpp	Adds “prefers interpreter entry point” flag and API surface.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and clears the “prefer interpreter” flag on code upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Updates allocator FCALLs to capture/pass a transition block under the new WASM calling convention.
src/coreclr/vm/method.hpp	Adds helper to initialize portable entry point state based on method characteristics.
src/coreclr/vm/method.cpp	Initializes portable entry points with optional PE→interp thunk and sets initial “prefer interpreter” state.
src/coreclr/vm/marshalnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/managedmdimport.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/jithelpers.cpp	Adjusts WASM FCALL wrappers to provide TransitionBlock context based on callers’ stack pointer sentinel.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration needed by new prestub-like PE path.
src/coreclr/vm/interpexec.cpp	Updates helper call patterns for PE ABI (frame-pointer + hidden args) and PE/native-entrypoint preference logic.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later to ensure dynamic method state is initialized first.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use flag-based interior tracking.
src/coreclr/vm/frames.h	Changes GCFrame ctor signature (flags instead of bool) and updates GCPROTECT macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame flag storage/scanning semantics and asserts correct interior-flag usage.
src/coreclr/vm/fcall.h	Adds WASM FCALL ABI support (hidden callersStackPointer + PE context) and wrapper generation macros.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock into exception context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer in WASM funclet path.
src/coreclr/vm/ecall.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/dynamicmethod.cpp	Adjusts contract mode and reorders Reset() to occur after signature/flags are set (WASM needs signature inspection).
src/coreclr/vm/comutilnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comsynchronizable.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/commodule.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdependenthandle.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdelegate.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/ceemain.cpp	Calls InitializeWasmThunkCaches() during EE startup on WASM.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock layout to carry a stack pointer (union overlay).
src/coreclr/vm/callhelpers.h	Adds WASM sentinel TERMINATE_R2R_STACK_WALK for stack-walk termination.
src/coreclr/vm/assemblynative.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/arraynative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/runtime/portable/WriteBarriers.cpp	Wraps portable write barrier stubs in FCIMPL for updated FCALL handling.
src/coreclr/runtime/portable/AllocFast.cpp	Updates fast alloc helpers to prepare/pass transition args (TransitionBlock) under the WASM ABI.
src/coreclr/runtime/MiscNativeHelpers.h	Adds WASM helper macros for preparing/passing TransitionBlock based on callersStackPointer sentinel.

[pavelsavara]

This breaks CI ☹️ (it's in-tree coreCLR)

Log

D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:22:5: error: unknown type name 'NOINLINE'
22 | NOINLINE static void CallFunc_F64_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:24:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:29:5: error: unknown type name 'NOINLINE'
29 | NOINLINE static void CallFunc_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:31:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
31 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:36:5: error: unknown type name 'NOINLINE'
36 | NOINLINE static void CallFunc_F64_I32_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:38:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
38 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^

[radekdoulik]

Indeed, it was masked by known build issue

#127177 should fix it

[davidwrighton]

• This includes some initial work where there is a predefined set of new thunks generated into the coreclr codebase. I expect that we'll build some sort of hardcoded list here for invokes to/from R2R code, and then have R2R supplement the list with extra cases.
• Adjust PortableEntryPoint calling convention to match the WASM version
• Update PortableEntryPoint::HasNativeEntryPoint to indicate that the NativeEntryPoint is the intentional target
• Update the calls from R2R into interpreter to capture the stack argument into the TransitionBlock
• Update all of the FCDECL/FCIMPL macros to capture the stack correctly
• Adjust the various FCalls which should capture a TransitionBlock to capture one from the callersStackPointer parameter to FCalls.
• Implement correct signature mapping for PortableEntryPoints which are FCalls
• Update interp to managed helpers to pass a stack pointer which informs the stack walker to stop walking
• Put the callers frame pointer into the TransitionBlock. To do so, I've added a new m_StackPointer field to the TransitionBlock
• Make the ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex function into functionally being the Prestub when called from R2R.
• Add m_StackPointer to TransitionBlock, and put the callers stack pointer in there.
• Update helper calls in interpexec to setup the stack pointer argument correctly

Fixes#123437

[dotnet-policy-service]

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

[Copilot]

Pull request overview

This PR updates CoreCLR’s WASM PortableEntryPoint and interpreter interop to support scenarios where R2R code calls through PortableEntryPoints that may ultimately target native entrypoints, including new thunk/signature handling and stack-walk termination plumbing.

Changes:

• Extend signature generation and thunk tables to distinguish PortableEntryPoint calls (via a 'p' suffix) and to include InternalCall/FCall shapes.
• Add/adjust WASM-side thunk implementations and runtime lookup/caching for R2R→interpreter and interpreter→native dispatch.
• Update PortableEntryPoint state tracking (preferring interpreter vs native) and propagate a stack-walk termination/stack pointer through TransitionBlock and helper call paths.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pregenerated signatures; writes cache as UTF-8.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct _PE call thunks for signatures ending in 'p' (PortableEntryPoint context).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans for MethodImplAttributes.InternalCall and emits 'p'-suffixed signatures.
src/coreclr/vm/wasm/helpers.cpp	Adds hardcoded R2R→interpreter thunks, PortableEntryPoint thunk cache, and signature key support for 'p' suffix.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated interpreter→native thunk implementations for PortableEntryPoint calls (*_PE) and signature table entries.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint-aware interpreted execution path that can run prestub work and dispatch to compiled code.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag and accessors.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint/SetActualCode semantics around “prefer interpreter” state.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoints with an optional R2R→interpreter thunk and marks them as preferring interpreter initially.
src/coreclr/vm/jithelpers.cpp	Updates WASM helper wrappers to pass stack-walk termination/TransitionBlock info into _Impl variants.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod prototype for PortableEntryPoint prestub dispatch use.
src/coreclr/vm/interpexec.cpp	Adds macros/typedefs to pass PortableEntryPoint stack/context args through helper calls; adjusts PortableEntryPoint native-entrypoint gating.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use GC flags instead of a bool.
src/coreclr/vm/frames.h	Changes GCFrame API from BOOL maybeInterior to UINT gcFlags and updates protection macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame behavior using gcFlags and asserts flag expectations.
src/coreclr/vm/fcall.h	Adjusts WASM FCALL/HCALL signatures to include hidden stack/context parameters.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock for WASM exception context.
src/coreclr/vm/eetwain.cpp	Ensures WASM TransitionBlock has stack pointer set for funclet calls.
src/coreclr/vm/callingconvention.h	Adds m_StackPointer overlay in WASM TransitionBlock.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates an internal FCALL-to-FCALL call site to pass the new WASM hidden parameters explicitly.

[Copilot]

Pull request overview

This PR updates the CoreCLR WASM PortableEntryPoint calling convention and thunk/signature infrastructure to support ReadyToRun (R2R) native entrypoints while preserving correct interpreter dispatch and stack-walking behavior.

Changes:

• Extends WASM signature generation to account for PortableEntryPoint context ('p') and InternalCall/FCall signature shapes.
• Adds R2R-to-interpreter thunk support, including capturing the caller stack pointer into TransitionBlock and using it to terminate/limit stack walking.
• Adjusts PortableEntryPoint state management and prestub-like behavior to correctly resolve interpreter vs native (R2R) targets.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this to signature mapping for instance methods.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Replaces icall table generation with InternalCall signature collection and adds pregenerated signature shapes.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct call thunks for PortableEntryPoint calls (extra hidden params + stack-walk termination).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New scanner to collect InternalCall signatures for thunk generation.
src/coreclr/vm/wasm/helpers.cpp	Adds R2R→interpreter thunk table/cache and updates managed calli invocation to carry PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates reverse-thunk exports and signature naming adjustments.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk table to include PE-aware signatures and call patterns.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves like prestub when invoked from R2R.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag/accessors and updates PortableEntryPoint API surface.
src/coreclr/vm/precode_portable.cpp	Updates native-entrypoint detection and allows “upgrade” from interpreter-preferred to actual code.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoint with an R2R→interpreter thunk when available and sets interpreter-preferred state.
src/coreclr/vm/jithelpers.cpp	WASM FCALL wrappers now pass stack pointer / transition info to exception helpers.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod for prestub/R2R dispatch paths.
src/coreclr/vm/interpexec.cpp	Adjusts helper calling patterns and PortableEntryPoint selection logic; threads stack-pointer through transition blocks.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to new ctor parameterization (gcFlags).
src/coreclr/vm/frames.h	Changes GCFrame API from maybeInterior to gcFlags and updates GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame gcFlags handling and enforces interior-flag expectations.
src/coreclr/vm/fcall.h	Updates FCALL/HCALL macro signatures for WASM to include hidden stack/context args.
src/coreclr/vm/excep.cpp	Plumbs interpreter stack pointer from TransitionBlock into exception frame context.
src/coreclr/vm/eetwain.cpp	Ensures WASM transition blocks set stack pointer consistently for funclet calls.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock to carry m_StackPointer.
src/coreclr/vm/callhelpers.h	Adds TERMINATE_R2R_STACK_WALK sentinel for WASM stack-walk termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates a FCALL wrapper to supply explicit hidden args under new WASM calling convention.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint plumbing to support ReadyToRun (R2R) native entrypoints and correct calling conventions/signature handling across interpreter ↔ native transitions (including FCalls), with additional stack-walk/TransitionBlock support.

Changes:

• Extend signature generation/mapping to support PortableEntryPoint context (p) and InternalCall (FCall) signatures; update thunk generation accordingly.
• Add initial hardcoded R2R→interpreter PortableEntryPoint thunk set and associated lookup/caching paths; adjust prestub-style dispatch for PortableEntryPoint calls.
• Update runtime structures/paths for WASM stack-walk termination and TransitionBlock stack pointer propagation; refactor GCFrame to use GC flag bitmasks.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection; adds pregenerated signature list.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct PE thunks (extra hidden params + stack-walk sentinel) and maps ...p signatures.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector for InternalCall method signatures (for PE thunk generation).
src/coreclr/vm/wasm/helpers.cpp	Adds PE thunk table + lookup; appends p to default-callconv signature keys; updates managed calli cookie invocation shape; adds thunk lookup for R2R→interp.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk implementations + table entries for ...p (PortableEntryPoint) signatures.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates generated reverse thunks and some signatures/entry mappings.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves prestub-like and can dispatch to R2R via InvokeManagedMethod.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag API to PortableEntryPoint.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and SetActualCode behavior with PrefersInterpreterEntryPoint.
src/coreclr/vm/method.cpp	Uses R2R→interp thunk when available and sets PrefersInterpreterEntryPoint on new PortableEntryPoints.
src/coreclr/vm/jithelpers.cpp	Updates WASM IL_Throw/IL_Rethrow/IL_ThrowExact wrappers to incorporate TransitionBlock/stack pointer logic.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration for new prestub path usage.
src/coreclr/vm/interpexec.cpp	Adds helper-call wrappers for WASM portable-entrypoint calling convention; updates PortableEntryPoint/native-entrypoint selection logic.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock storage with a unioned stack pointer field.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking.
src/coreclr/vm/frames.h	Updates GCFrame ctor signature (bool → flags) and adjusts GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame flag-based scanning behavior.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to pass GC flags.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint call later in IL stub creation.
src/coreclr/vm/fcall.h	Adjusts FCALL/HCALL signature macros for TARGET_WASM to include hidden params.
src/coreclr/vm/excep.cpp	Plumbs TransitionBlock stack pointer into SoftwareExceptionFrame context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer for WASM funclet path.
src/coreclr/runtime/portable/AllocFast.cpp	Updates RhpNewPtrArrayFast to match new WASM FCALL signature shape.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint / FCALL calling-convention plumbing to support scenarios where ReadyToRun (R2R) code has native entrypoints, including new/updated WASM thunk generation and TransitionBlock stack-pointer propagation.

Changes:

• Extend managed→native thunk signature generation to support PortableEntryPoint (“…p”) signatures and collect InternalCall shapes from System.Private.CoreLib.
• Add WASM-side thunk caches and interpreter dispatch paths to correctly pass PortableEntryPoint context and a stack-walk termination sentinel via TransitionBlock.
• Update FCALL/HCALL/GCFrame/PortableEntryPoint infrastructure to carry stack pointer state and prefer interpreter entrypoints until native code is available.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Add optional inclusion of this in signature encoding.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switch to InternalCall signature collection; add pregenerated PE signatures; UTF-8 cache write.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generate distinct PE thunk entrypoints and signatures with PE suffix handling.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New: scan CoreLib for InternalCall methods and emit PE thunk signatures.
src/coreclr/vm/wasm/helpers.hpp	New: startup init hook for wasm thunk caches.
src/coreclr/vm/wasm/helpers.cpp	Add PE thunk tables/caches; update calli cookie calling convention; init caches at startup.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Update reverse thunks/signatures to match new calling convention expectations.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Add “_PE” call thunks that pass PE context + stack-walk sentinel.
src/coreclr/vm/tailcallhelp.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/stubhelpers.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/runtimehandles.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/reflectioninvocation.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/prestub.cpp	Add PortableEntryPoint “complex” interpreter entry path behaving like prestub for R2R.
src/coreclr/vm/precode_portable.hpp	Add “prefers interpreter entrypoint” flag + APIs.
src/coreclr/vm/precode_portable.cpp	Adjust HasNativeEntryPoint logic; clear prefer-interpreter flag on upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Convert selected alloc helpers to FCIMPL + TransitionBlock-aware calling convention.
src/coreclr/vm/method.hpp	Add MethodDesc helper to initialize PE initial state.
src/coreclr/vm/method.cpp	Initialize/reset PE based on available PE→interp thunk; default to prefer-interpreter.
src/coreclr/vm/marshalnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/managedmdimport.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/jithelpers.cpp	WASM: build TransitionBlock for throw helpers using callersStackPointer sentinel logic.
src/coreclr/vm/interpexec.h	Expose InvokeManagedMethod for PortableEntryPoint prestub-like flow.
src/coreclr/vm/interpexec.cpp	Update helper-call sites to new calling convention; integrate prefer-interpreter logic.
src/coreclr/vm/ilstubcache.cpp	Move temporary entrypoint assignment after signature/flags setup.
src/coreclr/vm/gccover.cpp	Update GCFrame ctor usage to new gcFlags model.
src/coreclr/vm/frames.h	Replace maybeInterior bool with gcFlags.
src/coreclr/vm/frames.cpp	Implement gcFlags-based scanning behavior for GCFrame.
src/coreclr/vm/fcall.h	WASM: introduce wrapper/impl calling convention capture for callersStackPointer + PE context.
src/coreclr/vm/excep.cpp	Update TransitionBlock-derived interpreter context capture in exception frame.
src/coreclr/vm/eetwain.cpp	Ensure TransitionBlock stack pointer is initialized for WASM funclet calls.
src/coreclr/vm/ecall.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/dynamicmethod.cpp	Adjust contract mode + Reset ordering relative to signature/flags.
src/coreclr/vm/comutilnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comsynchronizable.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/commodule.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdependenthandle.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdelegate.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/ceemain.cpp	WASM: initialize thunk caches during EEStartup.
src/coreclr/vm/callingconvention.h	WASM: add m_StackPointer union member in TransitionBlock.
src/coreclr/vm/callhelpers.h	WASM: add TERMINATE_R2R_STACK_WALK sentinel definition.
src/coreclr/vm/assemblynative.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/arraynative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/runtime/portable/WriteBarriers.cpp	Convert write barrier stubs to FCIMPL for new WASM convention.
src/coreclr/runtime/portable/AllocFast.cpp	Add TransitionBlock-aware calling convention + helper macros; convert to FCIMPL.
src/coreclr/runtime/MiscNativeHelpers.h	Add PREPARE_TRANSITION_ARG helper for WASM/non-NativeAOT.

[radekdoulik]

I tried to run priority1 runtime tests and I see few failures. I will need to rerun it on main too, to see if it is introduced here or whether we regressed on main meanwhile. Doesn't need to block this PR though, we can fix it in a follow up PR. Just want to let you know.

Note for me: I should enable priority1 tests in the outer loop.

[radekdoulik]

LGTM, thank you!

[Copilot]

Pull request overview

This PR updates CoreCLR WASM portable entry point and FCall calling convention plumbing to support R2R/native entrypoints, including stack-pointer capture/propagation needed for correct transition handling and future stack walking on WASM. It also extends the WASM app builder codegen to generate (and pre-seed) additional thunk signatures, including InternalCall-driven portable entry point thunks.

Changes:

• Extend WASM thunk/signature generation to include InternalCall portable-entry-point shapes and pre-generated common signatures.
• Add WASM runtime support for portable-entry-point → interpreter thunks, thunk caches, and updated calli cookie invocation.
• Update portable entry point state/flags and transition block handling to carry a stack pointer, plus broad FCDECL/FCIMPL macro/call-site adjustments for the WASM ABI.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Allows optional inclusion of this in generated signatures (used for InternalCall scanning).
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pre-generated PE signatures.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates separate thunk entrypoints for portable entry point calls (extra hidden context + frame-pointer arg).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans System.Private.CoreLib InternalCalls and emits PE signatures.
src/coreclr/vm/wasm/helpers.hpp	Declares InitializeWasmThunkCaches for explicit EEStartup initialization.
src/coreclr/vm/wasm/helpers.cpp	Adds PE→interpreter thunk table/caches, updates thunk lookup/init, and adjusts calli invocation to pass PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates/renames some reverse thunks and signatures to align with updated calling convention shapes.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Adds PE-specific thunk entrypoints (extra frame-pointer + PE context) and updates thunk map keys.
src/coreclr/vm/tailcallhelp.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/stubhelpers.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/runtimehandles.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/reflectioninvocation.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path to act like prestub for R2R vs interpreter dispatch on WASM.
src/coreclr/vm/precode_portable.hpp	Adds “prefers interpreter entry point” flag and API surface.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and clears the “prefer interpreter” flag on code upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Updates allocator FCALLs to capture/pass a transition block under the new WASM calling convention.
src/coreclr/vm/method.hpp	Adds helper to initialize portable entry point state based on method characteristics.
src/coreclr/vm/method.cpp	Initializes portable entry points with optional PE→interp thunk and sets initial “prefer interpreter” state.
src/coreclr/vm/marshalnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/managedmdimport.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/jithelpers.cpp	Adjusts WASM FCALL wrappers to provide TransitionBlock context based on callers’ stack pointer sentinel.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration needed by new prestub-like PE path.
src/coreclr/vm/interpexec.cpp	Updates helper call patterns for PE ABI (frame-pointer + hidden args) and PE/native-entrypoint preference logic.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later to ensure dynamic method state is initialized first.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use flag-based interior tracking.
src/coreclr/vm/frames.h	Changes GCFrame ctor signature (flags instead of bool) and updates GCPROTECT macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame flag storage/scanning semantics and asserts correct interior-flag usage.
src/coreclr/vm/fcall.h	Adds WASM FCALL ABI support (hidden callersStackPointer + PE context) and wrapper generation macros.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock into exception context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer in WASM funclet path.
src/coreclr/vm/ecall.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/dynamicmethod.cpp	Adjusts contract mode and reorders Reset() to occur after signature/flags are set (WASM needs signature inspection).
src/coreclr/vm/comutilnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comsynchronizable.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/commodule.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdependenthandle.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdelegate.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/ceemain.cpp	Calls InitializeWasmThunkCaches() during EE startup on WASM.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock layout to carry a stack pointer (union overlay).
src/coreclr/vm/callhelpers.h	Adds WASM sentinel TERMINATE_R2R_STACK_WALK for stack-walk termination.
src/coreclr/vm/assemblynative.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/arraynative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/runtime/portable/WriteBarriers.cpp	Wraps portable write barrier stubs in FCIMPL for updated FCALL handling.
src/coreclr/runtime/portable/AllocFast.cpp	Updates fast alloc helpers to prepare/pass transition args (TransitionBlock) under the WASM ABI.
src/coreclr/runtime/MiscNativeHelpers.h	Adds WASM helper macros for preparing/passing TransitionBlock based on callersStackPointer sentinel.

[pavelsavara]

This breaks CI ☹️ (it's in-tree coreCLR)

Log

D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:22:5: error: unknown type name 'NOINLINE'
22 | NOINLINE static void CallFunc_F64_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:24:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:29:5: error: unknown type name 'NOINLINE'
29 | NOINLINE static void CallFunc_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:31:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
31 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:36:5: error: unknown type name 'NOINLINE'
36 | NOINLINE static void CallFunc_F64_I32_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:38:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
38 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^

[radekdoulik]

Indeed, it was masked by known build issue

#127177 should fix it

[davidwrighton]

• This includes some initial work where there is a predefined set of new thunks generated into the coreclr codebase. I expect that we'll build some sort of hardcoded list here for invokes to/from R2R code, and then have R2R supplement the list with extra cases.
• Adjust PortableEntryPoint calling convention to match the WASM version
• Update PortableEntryPoint::HasNativeEntryPoint to indicate that the NativeEntryPoint is the intentional target
• Update the calls from R2R into interpreter to capture the stack argument into the TransitionBlock
• Update all of the FCDECL/FCIMPL macros to capture the stack correctly
• Adjust the various FCalls which should capture a TransitionBlock to capture one from the callersStackPointer parameter to FCalls.
• Implement correct signature mapping for PortableEntryPoints which are FCalls
• Update interp to managed helpers to pass a stack pointer which informs the stack walker to stop walking
• Put the callers frame pointer into the TransitionBlock. To do so, I've added a new m_StackPointer field to the TransitionBlock
• Make the ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex function into functionally being the Prestub when called from R2R.
• Add m_StackPointer to TransitionBlock, and put the callers stack pointer in there.
• Update helper calls in interpexec to setup the stack pointer argument correctly

Fixes#123437

[dotnet-policy-service]

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

[Copilot]

Pull request overview

This PR updates CoreCLR’s WASM PortableEntryPoint and interpreter interop to support scenarios where R2R code calls through PortableEntryPoints that may ultimately target native entrypoints, including new thunk/signature handling and stack-walk termination plumbing.

Changes:

• Extend signature generation and thunk tables to distinguish PortableEntryPoint calls (via a 'p' suffix) and to include InternalCall/FCall shapes.
• Add/adjust WASM-side thunk implementations and runtime lookup/caching for R2R→interpreter and interpreter→native dispatch.
• Update PortableEntryPoint state tracking (preferring interpreter vs native) and propagate a stack-walk termination/stack pointer through TransitionBlock and helper call paths.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pregenerated signatures; writes cache as UTF-8.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct _PE call thunks for signatures ending in 'p' (PortableEntryPoint context).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans for MethodImplAttributes.InternalCall and emits 'p'-suffixed signatures.
src/coreclr/vm/wasm/helpers.cpp	Adds hardcoded R2R→interpreter thunks, PortableEntryPoint thunk cache, and signature key support for 'p' suffix.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated interpreter→native thunk implementations for PortableEntryPoint calls (*_PE) and signature table entries.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint-aware interpreted execution path that can run prestub work and dispatch to compiled code.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag and accessors.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint/SetActualCode semantics around “prefer interpreter” state.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoints with an optional R2R→interpreter thunk and marks them as preferring interpreter initially.
src/coreclr/vm/jithelpers.cpp	Updates WASM helper wrappers to pass stack-walk termination/TransitionBlock info into _Impl variants.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod prototype for PortableEntryPoint prestub dispatch use.
src/coreclr/vm/interpexec.cpp	Adds macros/typedefs to pass PortableEntryPoint stack/context args through helper calls; adjusts PortableEntryPoint native-entrypoint gating.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use GC flags instead of a bool.
src/coreclr/vm/frames.h	Changes GCFrame API from BOOL maybeInterior to UINT gcFlags and updates protection macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame behavior using gcFlags and asserts flag expectations.
src/coreclr/vm/fcall.h	Adjusts WASM FCALL/HCALL signatures to include hidden stack/context parameters.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock for WASM exception context.
src/coreclr/vm/eetwain.cpp	Ensures WASM TransitionBlock has stack pointer set for funclet calls.
src/coreclr/vm/callingconvention.h	Adds m_StackPointer overlay in WASM TransitionBlock.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates an internal FCALL-to-FCALL call site to pass the new WASM hidden parameters explicitly.

[Copilot]

Pull request overview

This PR updates the CoreCLR WASM PortableEntryPoint calling convention and thunk/signature infrastructure to support ReadyToRun (R2R) native entrypoints while preserving correct interpreter dispatch and stack-walking behavior.

Changes:

• Extends WASM signature generation to account for PortableEntryPoint context ('p') and InternalCall/FCall signature shapes.
• Adds R2R-to-interpreter thunk support, including capturing the caller stack pointer into TransitionBlock and using it to terminate/limit stack walking.
• Adjusts PortableEntryPoint state management and prestub-like behavior to correctly resolve interpreter vs native (R2R) targets.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this to signature mapping for instance methods.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Replaces icall table generation with InternalCall signature collection and adds pregenerated signature shapes.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct call thunks for PortableEntryPoint calls (extra hidden params + stack-walk termination).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New scanner to collect InternalCall signatures for thunk generation.
src/coreclr/vm/wasm/helpers.cpp	Adds R2R→interpreter thunk table/cache and updates managed calli invocation to carry PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates reverse-thunk exports and signature naming adjustments.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk table to include PE-aware signatures and call patterns.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves like prestub when invoked from R2R.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag/accessors and updates PortableEntryPoint API surface.
src/coreclr/vm/precode_portable.cpp	Updates native-entrypoint detection and allows “upgrade” from interpreter-preferred to actual code.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoint with an R2R→interpreter thunk when available and sets interpreter-preferred state.
src/coreclr/vm/jithelpers.cpp	WASM FCALL wrappers now pass stack pointer / transition info to exception helpers.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod for prestub/R2R dispatch paths.
src/coreclr/vm/interpexec.cpp	Adjusts helper calling patterns and PortableEntryPoint selection logic; threads stack-pointer through transition blocks.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to new ctor parameterization (gcFlags).
src/coreclr/vm/frames.h	Changes GCFrame API from maybeInterior to gcFlags and updates GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame gcFlags handling and enforces interior-flag expectations.
src/coreclr/vm/fcall.h	Updates FCALL/HCALL macro signatures for WASM to include hidden stack/context args.
src/coreclr/vm/excep.cpp	Plumbs interpreter stack pointer from TransitionBlock into exception frame context.
src/coreclr/vm/eetwain.cpp	Ensures WASM transition blocks set stack pointer consistently for funclet calls.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock to carry m_StackPointer.
src/coreclr/vm/callhelpers.h	Adds TERMINATE_R2R_STACK_WALK sentinel for WASM stack-walk termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates a FCALL wrapper to supply explicit hidden args under new WASM calling convention.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint plumbing to support ReadyToRun (R2R) native entrypoints and correct calling conventions/signature handling across interpreter ↔ native transitions (including FCalls), with additional stack-walk/TransitionBlock support.

Changes:

• Extend signature generation/mapping to support PortableEntryPoint context (p) and InternalCall (FCall) signatures; update thunk generation accordingly.
• Add initial hardcoded R2R→interpreter PortableEntryPoint thunk set and associated lookup/caching paths; adjust prestub-style dispatch for PortableEntryPoint calls.
• Update runtime structures/paths for WASM stack-walk termination and TransitionBlock stack pointer propagation; refactor GCFrame to use GC flag bitmasks.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection; adds pregenerated signature list.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct PE thunks (extra hidden params + stack-walk sentinel) and maps ...p signatures.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector for InternalCall method signatures (for PE thunk generation).
src/coreclr/vm/wasm/helpers.cpp	Adds PE thunk table + lookup; appends p to default-callconv signature keys; updates managed calli cookie invocation shape; adds thunk lookup for R2R→interp.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk implementations + table entries for ...p (PortableEntryPoint) signatures.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates generated reverse thunks and some signatures/entry mappings.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves prestub-like and can dispatch to R2R via InvokeManagedMethod.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag API to PortableEntryPoint.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and SetActualCode behavior with PrefersInterpreterEntryPoint.
src/coreclr/vm/method.cpp	Uses R2R→interp thunk when available and sets PrefersInterpreterEntryPoint on new PortableEntryPoints.
src/coreclr/vm/jithelpers.cpp	Updates WASM IL_Throw/IL_Rethrow/IL_ThrowExact wrappers to incorporate TransitionBlock/stack pointer logic.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration for new prestub path usage.
src/coreclr/vm/interpexec.cpp	Adds helper-call wrappers for WASM portable-entrypoint calling convention; updates PortableEntryPoint/native-entrypoint selection logic.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock storage with a unioned stack pointer field.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking.
src/coreclr/vm/frames.h	Updates GCFrame ctor signature (bool → flags) and adjusts GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame flag-based scanning behavior.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to pass GC flags.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint call later in IL stub creation.
src/coreclr/vm/fcall.h	Adjusts FCALL/HCALL signature macros for TARGET_WASM to include hidden params.
src/coreclr/vm/excep.cpp	Plumbs TransitionBlock stack pointer into SoftwareExceptionFrame context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer for WASM funclet path.
src/coreclr/runtime/portable/AllocFast.cpp	Updates RhpNewPtrArrayFast to match new WASM FCALL signature shape.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint / FCALL calling-convention plumbing to support scenarios where ReadyToRun (R2R) code has native entrypoints, including new/updated WASM thunk generation and TransitionBlock stack-pointer propagation.

Changes:

• Extend managed→native thunk signature generation to support PortableEntryPoint (“…p”) signatures and collect InternalCall shapes from System.Private.CoreLib.
• Add WASM-side thunk caches and interpreter dispatch paths to correctly pass PortableEntryPoint context and a stack-walk termination sentinel via TransitionBlock.
• Update FCALL/HCALL/GCFrame/PortableEntryPoint infrastructure to carry stack pointer state and prefer interpreter entrypoints until native code is available.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Add optional inclusion of this in signature encoding.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switch to InternalCall signature collection; add pregenerated PE signatures; UTF-8 cache write.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generate distinct PE thunk entrypoints and signatures with PE suffix handling.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New: scan CoreLib for InternalCall methods and emit PE thunk signatures.
src/coreclr/vm/wasm/helpers.hpp	New: startup init hook for wasm thunk caches.
src/coreclr/vm/wasm/helpers.cpp	Add PE thunk tables/caches; update calli cookie calling convention; init caches at startup.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Update reverse thunks/signatures to match new calling convention expectations.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Add “_PE” call thunks that pass PE context + stack-walk sentinel.
src/coreclr/vm/tailcallhelp.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/stubhelpers.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/runtimehandles.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/reflectioninvocation.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/prestub.cpp	Add PortableEntryPoint “complex” interpreter entry path behaving like prestub for R2R.
src/coreclr/vm/precode_portable.hpp	Add “prefers interpreter entrypoint” flag + APIs.
src/coreclr/vm/precode_portable.cpp	Adjust HasNativeEntryPoint logic; clear prefer-interpreter flag on upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Convert selected alloc helpers to FCIMPL + TransitionBlock-aware calling convention.
src/coreclr/vm/method.hpp	Add MethodDesc helper to initialize PE initial state.
src/coreclr/vm/method.cpp	Initialize/reset PE based on available PE→interp thunk; default to prefer-interpreter.
src/coreclr/vm/marshalnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/managedmdimport.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/jithelpers.cpp	WASM: build TransitionBlock for throw helpers using callersStackPointer sentinel logic.
src/coreclr/vm/interpexec.h	Expose InvokeManagedMethod for PortableEntryPoint prestub-like flow.
src/coreclr/vm/interpexec.cpp	Update helper-call sites to new calling convention; integrate prefer-interpreter logic.
src/coreclr/vm/ilstubcache.cpp	Move temporary entrypoint assignment after signature/flags setup.
src/coreclr/vm/gccover.cpp	Update GCFrame ctor usage to new gcFlags model.
src/coreclr/vm/frames.h	Replace maybeInterior bool with gcFlags.
src/coreclr/vm/frames.cpp	Implement gcFlags-based scanning behavior for GCFrame.
src/coreclr/vm/fcall.h	WASM: introduce wrapper/impl calling convention capture for callersStackPointer + PE context.
src/coreclr/vm/excep.cpp	Update TransitionBlock-derived interpreter context capture in exception frame.
src/coreclr/vm/eetwain.cpp	Ensure TransitionBlock stack pointer is initialized for WASM funclet calls.
src/coreclr/vm/ecall.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/dynamicmethod.cpp	Adjust contract mode + Reset ordering relative to signature/flags.
src/coreclr/vm/comutilnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comsynchronizable.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/commodule.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdependenthandle.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdelegate.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/ceemain.cpp	WASM: initialize thunk caches during EEStartup.
src/coreclr/vm/callingconvention.h	WASM: add m_StackPointer union member in TransitionBlock.
src/coreclr/vm/callhelpers.h	WASM: add TERMINATE_R2R_STACK_WALK sentinel definition.
src/coreclr/vm/assemblynative.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/arraynative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/runtime/portable/WriteBarriers.cpp	Convert write barrier stubs to FCIMPL for new WASM convention.
src/coreclr/runtime/portable/AllocFast.cpp	Add TransitionBlock-aware calling convention + helper macros; convert to FCIMPL.
src/coreclr/runtime/MiscNativeHelpers.h	Add PREPARE_TRANSITION_ARG helper for WASM/non-NativeAOT.

[radekdoulik]

I tried to run priority1 runtime tests and I see few failures. I will need to rerun it on main too, to see if it is introduced here or whether we regressed on main meanwhile. Doesn't need to block this PR though, we can fix it in a follow up PR. Just want to let you know.

Note for me: I should enable priority1 tests in the outer loop.

[radekdoulik]

LGTM, thank you!

[Copilot]

Pull request overview

This PR updates CoreCLR WASM portable entry point and FCall calling convention plumbing to support R2R/native entrypoints, including stack-pointer capture/propagation needed for correct transition handling and future stack walking on WASM. It also extends the WASM app builder codegen to generate (and pre-seed) additional thunk signatures, including InternalCall-driven portable entry point thunks.

Changes:

• Extend WASM thunk/signature generation to include InternalCall portable-entry-point shapes and pre-generated common signatures.
• Add WASM runtime support for portable-entry-point → interpreter thunks, thunk caches, and updated calli cookie invocation.
• Update portable entry point state/flags and transition block handling to carry a stack pointer, plus broad FCDECL/FCIMPL macro/call-site adjustments for the WASM ABI.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Allows optional inclusion of this in generated signatures (used for InternalCall scanning).
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pre-generated PE signatures.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates separate thunk entrypoints for portable entry point calls (extra hidden context + frame-pointer arg).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans System.Private.CoreLib InternalCalls and emits PE signatures.
src/coreclr/vm/wasm/helpers.hpp	Declares InitializeWasmThunkCaches for explicit EEStartup initialization.
src/coreclr/vm/wasm/helpers.cpp	Adds PE→interpreter thunk table/caches, updates thunk lookup/init, and adjusts calli invocation to pass PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates/renames some reverse thunks and signatures to align with updated calling convention shapes.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Adds PE-specific thunk entrypoints (extra frame-pointer + PE context) and updates thunk map keys.
src/coreclr/vm/tailcallhelp.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/stubhelpers.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/runtimehandles.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/reflectioninvocation.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path to act like prestub for R2R vs interpreter dispatch on WASM.
src/coreclr/vm/precode_portable.hpp	Adds “prefers interpreter entry point” flag and API surface.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and clears the “prefer interpreter” flag on code upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Updates allocator FCALLs to capture/pass a transition block under the new WASM calling convention.
src/coreclr/vm/method.hpp	Adds helper to initialize portable entry point state based on method characteristics.
src/coreclr/vm/method.cpp	Initializes portable entry points with optional PE→interp thunk and sets initial “prefer interpreter” state.
src/coreclr/vm/marshalnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/managedmdimport.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/jithelpers.cpp	Adjusts WASM FCALL wrappers to provide TransitionBlock context based on callers’ stack pointer sentinel.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration needed by new prestub-like PE path.
src/coreclr/vm/interpexec.cpp	Updates helper call patterns for PE ABI (frame-pointer + hidden args) and PE/native-entrypoint preference logic.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later to ensure dynamic method state is initialized first.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use flag-based interior tracking.
src/coreclr/vm/frames.h	Changes GCFrame ctor signature (flags instead of bool) and updates GCPROTECT macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame flag storage/scanning semantics and asserts correct interior-flag usage.
src/coreclr/vm/fcall.h	Adds WASM FCALL ABI support (hidden callersStackPointer + PE context) and wrapper generation macros.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock into exception context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer in WASM funclet path.
src/coreclr/vm/ecall.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/dynamicmethod.cpp	Adjusts contract mode and reorders Reset() to occur after signature/flags are set (WASM needs signature inspection).
src/coreclr/vm/comutilnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comsynchronizable.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/commodule.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdependenthandle.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdelegate.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/ceemain.cpp	Calls InitializeWasmThunkCaches() during EE startup on WASM.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock layout to carry a stack pointer (union overlay).
src/coreclr/vm/callhelpers.h	Adds WASM sentinel TERMINATE_R2R_STACK_WALK for stack-walk termination.
src/coreclr/vm/assemblynative.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/arraynative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/runtime/portable/WriteBarriers.cpp	Wraps portable write barrier stubs in FCIMPL for updated FCALL handling.
src/coreclr/runtime/portable/AllocFast.cpp	Updates fast alloc helpers to prepare/pass transition args (TransitionBlock) under the WASM ABI.
src/coreclr/runtime/MiscNativeHelpers.h	Adds WASM helper macros for preparing/passing TransitionBlock based on callersStackPointer sentinel.

[pavelsavara]

This breaks CI ☹️ (it's in-tree coreCLR)

Log

D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:22:5: error: unknown type name 'NOINLINE'
22 | NOINLINE static void CallFunc_F64_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:24:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:29:5: error: unknown type name 'NOINLINE'
29 | NOINLINE static void CallFunc_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:31:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
31 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:36:5: error: unknown type name 'NOINLINE'
36 | NOINLINE static void CallFunc_F64_I32_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:38:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
38 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^

[radekdoulik]

Indeed, it was masked by known build issue

#127177 should fix it

[davidwrighton]

• This includes some initial work where there is a predefined set of new thunks generated into the coreclr codebase. I expect that we'll build some sort of hardcoded list here for invokes to/from R2R code, and then have R2R supplement the list with extra cases.
• Adjust PortableEntryPoint calling convention to match the WASM version
• Update PortableEntryPoint::HasNativeEntryPoint to indicate that the NativeEntryPoint is the intentional target
• Update the calls from R2R into interpreter to capture the stack argument into the TransitionBlock
• Update all of the FCDECL/FCIMPL macros to capture the stack correctly
• Adjust the various FCalls which should capture a TransitionBlock to capture one from the callersStackPointer parameter to FCalls.
• Implement correct signature mapping for PortableEntryPoints which are FCalls
• Update interp to managed helpers to pass a stack pointer which informs the stack walker to stop walking
• Put the callers frame pointer into the TransitionBlock. To do so, I've added a new m_StackPointer field to the TransitionBlock
• Make the ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex function into functionally being the Prestub when called from R2R.
• Add m_StackPointer to TransitionBlock, and put the callers stack pointer in there.
• Update helper calls in interpexec to setup the stack pointer argument correctly

Fixes#123437

[dotnet-policy-service]

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

[Copilot]

Pull request overview

This PR updates CoreCLR’s WASM PortableEntryPoint and interpreter interop to support scenarios where R2R code calls through PortableEntryPoints that may ultimately target native entrypoints, including new thunk/signature handling and stack-walk termination plumbing.

Changes:

• Extend signature generation and thunk tables to distinguish PortableEntryPoint calls (via a 'p' suffix) and to include InternalCall/FCall shapes.
• Add/adjust WASM-side thunk implementations and runtime lookup/caching for R2R→interpreter and interpreter→native dispatch.
• Update PortableEntryPoint state tracking (preferring interpreter vs native) and propagate a stack-walk termination/stack pointer through TransitionBlock and helper call paths.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pregenerated signatures; writes cache as UTF-8.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct _PE call thunks for signatures ending in 'p' (PortableEntryPoint context).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans for MethodImplAttributes.InternalCall and emits 'p'-suffixed signatures.
src/coreclr/vm/wasm/helpers.cpp	Adds hardcoded R2R→interpreter thunks, PortableEntryPoint thunk cache, and signature key support for 'p' suffix.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated interpreter→native thunk implementations for PortableEntryPoint calls (*_PE) and signature table entries.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint-aware interpreted execution path that can run prestub work and dispatch to compiled code.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag and accessors.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint/SetActualCode semantics around “prefer interpreter” state.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoints with an optional R2R→interpreter thunk and marks them as preferring interpreter initially.
src/coreclr/vm/jithelpers.cpp	Updates WASM helper wrappers to pass stack-walk termination/TransitionBlock info into _Impl variants.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod prototype for PortableEntryPoint prestub dispatch use.
src/coreclr/vm/interpexec.cpp	Adds macros/typedefs to pass PortableEntryPoint stack/context args through helper calls; adjusts PortableEntryPoint native-entrypoint gating.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use GC flags instead of a bool.
src/coreclr/vm/frames.h	Changes GCFrame API from BOOL maybeInterior to UINT gcFlags and updates protection macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame behavior using gcFlags and asserts flag expectations.
src/coreclr/vm/fcall.h	Adjusts WASM FCALL/HCALL signatures to include hidden stack/context parameters.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock for WASM exception context.
src/coreclr/vm/eetwain.cpp	Ensures WASM TransitionBlock has stack pointer set for funclet calls.
src/coreclr/vm/callingconvention.h	Adds m_StackPointer overlay in WASM TransitionBlock.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates an internal FCALL-to-FCALL call site to pass the new WASM hidden parameters explicitly.

[Copilot]

Pull request overview

This PR updates the CoreCLR WASM PortableEntryPoint calling convention and thunk/signature infrastructure to support ReadyToRun (R2R) native entrypoints while preserving correct interpreter dispatch and stack-walking behavior.

Changes:

• Extends WASM signature generation to account for PortableEntryPoint context ('p') and InternalCall/FCall signature shapes.
• Adds R2R-to-interpreter thunk support, including capturing the caller stack pointer into TransitionBlock and using it to terminate/limit stack walking.
• Adjusts PortableEntryPoint state management and prestub-like behavior to correctly resolve interpreter vs native (R2R) targets.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this to signature mapping for instance methods.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Replaces icall table generation with InternalCall signature collection and adds pregenerated signature shapes.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct call thunks for PortableEntryPoint calls (extra hidden params + stack-walk termination).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New scanner to collect InternalCall signatures for thunk generation.
src/coreclr/vm/wasm/helpers.cpp	Adds R2R→interpreter thunk table/cache and updates managed calli invocation to carry PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates reverse-thunk exports and signature naming adjustments.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk table to include PE-aware signatures and call patterns.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves like prestub when invoked from R2R.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag/accessors and updates PortableEntryPoint API surface.
src/coreclr/vm/precode_portable.cpp	Updates native-entrypoint detection and allows “upgrade” from interpreter-preferred to actual code.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoint with an R2R→interpreter thunk when available and sets interpreter-preferred state.
src/coreclr/vm/jithelpers.cpp	WASM FCALL wrappers now pass stack pointer / transition info to exception helpers.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod for prestub/R2R dispatch paths.
src/coreclr/vm/interpexec.cpp	Adjusts helper calling patterns and PortableEntryPoint selection logic; threads stack-pointer through transition blocks.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to new ctor parameterization (gcFlags).
src/coreclr/vm/frames.h	Changes GCFrame API from maybeInterior to gcFlags and updates GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame gcFlags handling and enforces interior-flag expectations.
src/coreclr/vm/fcall.h	Updates FCALL/HCALL macro signatures for WASM to include hidden stack/context args.
src/coreclr/vm/excep.cpp	Plumbs interpreter stack pointer from TransitionBlock into exception frame context.
src/coreclr/vm/eetwain.cpp	Ensures WASM transition blocks set stack pointer consistently for funclet calls.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock to carry m_StackPointer.
src/coreclr/vm/callhelpers.h	Adds TERMINATE_R2R_STACK_WALK sentinel for WASM stack-walk termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates a FCALL wrapper to supply explicit hidden args under new WASM calling convention.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint plumbing to support ReadyToRun (R2R) native entrypoints and correct calling conventions/signature handling across interpreter ↔ native transitions (including FCalls), with additional stack-walk/TransitionBlock support.

Changes:

• Extend signature generation/mapping to support PortableEntryPoint context (p) and InternalCall (FCall) signatures; update thunk generation accordingly.
• Add initial hardcoded R2R→interpreter PortableEntryPoint thunk set and associated lookup/caching paths; adjust prestub-style dispatch for PortableEntryPoint calls.
• Update runtime structures/paths for WASM stack-walk termination and TransitionBlock stack pointer propagation; refactor GCFrame to use GC flag bitmasks.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection; adds pregenerated signature list.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct PE thunks (extra hidden params + stack-walk sentinel) and maps ...p signatures.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector for InternalCall method signatures (for PE thunk generation).
src/coreclr/vm/wasm/helpers.cpp	Adds PE thunk table + lookup; appends p to default-callconv signature keys; updates managed calli cookie invocation shape; adds thunk lookup for R2R→interp.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk implementations + table entries for ...p (PortableEntryPoint) signatures.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates generated reverse thunks and some signatures/entry mappings.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves prestub-like and can dispatch to R2R via InvokeManagedMethod.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag API to PortableEntryPoint.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and SetActualCode behavior with PrefersInterpreterEntryPoint.
src/coreclr/vm/method.cpp	Uses R2R→interp thunk when available and sets PrefersInterpreterEntryPoint on new PortableEntryPoints.
src/coreclr/vm/jithelpers.cpp	Updates WASM IL_Throw/IL_Rethrow/IL_ThrowExact wrappers to incorporate TransitionBlock/stack pointer logic.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration for new prestub path usage.
src/coreclr/vm/interpexec.cpp	Adds helper-call wrappers for WASM portable-entrypoint calling convention; updates PortableEntryPoint/native-entrypoint selection logic.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock storage with a unioned stack pointer field.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking.
src/coreclr/vm/frames.h	Updates GCFrame ctor signature (bool → flags) and adjusts GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame flag-based scanning behavior.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to pass GC flags.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint call later in IL stub creation.
src/coreclr/vm/fcall.h	Adjusts FCALL/HCALL signature macros for TARGET_WASM to include hidden params.
src/coreclr/vm/excep.cpp	Plumbs TransitionBlock stack pointer into SoftwareExceptionFrame context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer for WASM funclet path.
src/coreclr/runtime/portable/AllocFast.cpp	Updates RhpNewPtrArrayFast to match new WASM FCALL signature shape.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint / FCALL calling-convention plumbing to support scenarios where ReadyToRun (R2R) code has native entrypoints, including new/updated WASM thunk generation and TransitionBlock stack-pointer propagation.

Changes:

• Extend managed→native thunk signature generation to support PortableEntryPoint (“…p”) signatures and collect InternalCall shapes from System.Private.CoreLib.
• Add WASM-side thunk caches and interpreter dispatch paths to correctly pass PortableEntryPoint context and a stack-walk termination sentinel via TransitionBlock.
• Update FCALL/HCALL/GCFrame/PortableEntryPoint infrastructure to carry stack pointer state and prefer interpreter entrypoints until native code is available.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Add optional inclusion of this in signature encoding.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switch to InternalCall signature collection; add pregenerated PE signatures; UTF-8 cache write.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generate distinct PE thunk entrypoints and signatures with PE suffix handling.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New: scan CoreLib for InternalCall methods and emit PE thunk signatures.
src/coreclr/vm/wasm/helpers.hpp	New: startup init hook for wasm thunk caches.
src/coreclr/vm/wasm/helpers.cpp	Add PE thunk tables/caches; update calli cookie calling convention; init caches at startup.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Update reverse thunks/signatures to match new calling convention expectations.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Add “_PE” call thunks that pass PE context + stack-walk sentinel.
src/coreclr/vm/tailcallhelp.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/stubhelpers.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/runtimehandles.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/reflectioninvocation.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/prestub.cpp	Add PortableEntryPoint “complex” interpreter entry path behaving like prestub for R2R.
src/coreclr/vm/precode_portable.hpp	Add “prefers interpreter entrypoint” flag + APIs.
src/coreclr/vm/precode_portable.cpp	Adjust HasNativeEntryPoint logic; clear prefer-interpreter flag on upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Convert selected alloc helpers to FCIMPL + TransitionBlock-aware calling convention.
src/coreclr/vm/method.hpp	Add MethodDesc helper to initialize PE initial state.
src/coreclr/vm/method.cpp	Initialize/reset PE based on available PE→interp thunk; default to prefer-interpreter.
src/coreclr/vm/marshalnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/managedmdimport.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/jithelpers.cpp	WASM: build TransitionBlock for throw helpers using callersStackPointer sentinel logic.
src/coreclr/vm/interpexec.h	Expose InvokeManagedMethod for PortableEntryPoint prestub-like flow.
src/coreclr/vm/interpexec.cpp	Update helper-call sites to new calling convention; integrate prefer-interpreter logic.
src/coreclr/vm/ilstubcache.cpp	Move temporary entrypoint assignment after signature/flags setup.
src/coreclr/vm/gccover.cpp	Update GCFrame ctor usage to new gcFlags model.
src/coreclr/vm/frames.h	Replace maybeInterior bool with gcFlags.
src/coreclr/vm/frames.cpp	Implement gcFlags-based scanning behavior for GCFrame.
src/coreclr/vm/fcall.h	WASM: introduce wrapper/impl calling convention capture for callersStackPointer + PE context.
src/coreclr/vm/excep.cpp	Update TransitionBlock-derived interpreter context capture in exception frame.
src/coreclr/vm/eetwain.cpp	Ensure TransitionBlock stack pointer is initialized for WASM funclet calls.
src/coreclr/vm/ecall.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/dynamicmethod.cpp	Adjust contract mode + Reset ordering relative to signature/flags.
src/coreclr/vm/comutilnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comsynchronizable.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/commodule.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdependenthandle.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdelegate.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/ceemain.cpp	WASM: initialize thunk caches during EEStartup.
src/coreclr/vm/callingconvention.h	WASM: add m_StackPointer union member in TransitionBlock.
src/coreclr/vm/callhelpers.h	WASM: add TERMINATE_R2R_STACK_WALK sentinel definition.
src/coreclr/vm/assemblynative.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/arraynative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/runtime/portable/WriteBarriers.cpp	Convert write barrier stubs to FCIMPL for new WASM convention.
src/coreclr/runtime/portable/AllocFast.cpp	Add TransitionBlock-aware calling convention + helper macros; convert to FCIMPL.
src/coreclr/runtime/MiscNativeHelpers.h	Add PREPARE_TRANSITION_ARG helper for WASM/non-NativeAOT.

[radekdoulik]

I tried to run priority1 runtime tests and I see few failures. I will need to rerun it on main too, to see if it is introduced here or whether we regressed on main meanwhile. Doesn't need to block this PR though, we can fix it in a follow up PR. Just want to let you know.

Note for me: I should enable priority1 tests in the outer loop.

[radekdoulik]

LGTM, thank you!

[Copilot]

Pull request overview

This PR updates CoreCLR WASM portable entry point and FCall calling convention plumbing to support R2R/native entrypoints, including stack-pointer capture/propagation needed for correct transition handling and future stack walking on WASM. It also extends the WASM app builder codegen to generate (and pre-seed) additional thunk signatures, including InternalCall-driven portable entry point thunks.

Changes:

• Extend WASM thunk/signature generation to include InternalCall portable-entry-point shapes and pre-generated common signatures.
• Add WASM runtime support for portable-entry-point → interpreter thunks, thunk caches, and updated calli cookie invocation.
• Update portable entry point state/flags and transition block handling to carry a stack pointer, plus broad FCDECL/FCIMPL macro/call-site adjustments for the WASM ABI.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Allows optional inclusion of this in generated signatures (used for InternalCall scanning).
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pre-generated PE signatures.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates separate thunk entrypoints for portable entry point calls (extra hidden context + frame-pointer arg).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans System.Private.CoreLib InternalCalls and emits PE signatures.
src/coreclr/vm/wasm/helpers.hpp	Declares InitializeWasmThunkCaches for explicit EEStartup initialization.
src/coreclr/vm/wasm/helpers.cpp	Adds PE→interpreter thunk table/caches, updates thunk lookup/init, and adjusts calli invocation to pass PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates/renames some reverse thunks and signatures to align with updated calling convention shapes.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Adds PE-specific thunk entrypoints (extra frame-pointer + PE context) and updates thunk map keys.
src/coreclr/vm/tailcallhelp.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/stubhelpers.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/runtimehandles.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/reflectioninvocation.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path to act like prestub for R2R vs interpreter dispatch on WASM.
src/coreclr/vm/precode_portable.hpp	Adds “prefers interpreter entry point” flag and API surface.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and clears the “prefer interpreter” flag on code upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Updates allocator FCALLs to capture/pass a transition block under the new WASM calling convention.
src/coreclr/vm/method.hpp	Adds helper to initialize portable entry point state based on method characteristics.
src/coreclr/vm/method.cpp	Initializes portable entry points with optional PE→interp thunk and sets initial “prefer interpreter” state.
src/coreclr/vm/marshalnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/managedmdimport.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/jithelpers.cpp	Adjusts WASM FCALL wrappers to provide TransitionBlock context based on callers’ stack pointer sentinel.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration needed by new prestub-like PE path.
src/coreclr/vm/interpexec.cpp	Updates helper call patterns for PE ABI (frame-pointer + hidden args) and PE/native-entrypoint preference logic.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later to ensure dynamic method state is initialized first.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use flag-based interior tracking.
src/coreclr/vm/frames.h	Changes GCFrame ctor signature (flags instead of bool) and updates GCPROTECT macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame flag storage/scanning semantics and asserts correct interior-flag usage.
src/coreclr/vm/fcall.h	Adds WASM FCALL ABI support (hidden callersStackPointer + PE context) and wrapper generation macros.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock into exception context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer in WASM funclet path.
src/coreclr/vm/ecall.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/dynamicmethod.cpp	Adjusts contract mode and reorders Reset() to occur after signature/flags are set (WASM needs signature inspection).
src/coreclr/vm/comutilnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comsynchronizable.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/commodule.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdependenthandle.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdelegate.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/ceemain.cpp	Calls InitializeWasmThunkCaches() during EE startup on WASM.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock layout to carry a stack pointer (union overlay).
src/coreclr/vm/callhelpers.h	Adds WASM sentinel TERMINATE_R2R_STACK_WALK for stack-walk termination.
src/coreclr/vm/assemblynative.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/arraynative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/runtime/portable/WriteBarriers.cpp	Wraps portable write barrier stubs in FCIMPL for updated FCALL handling.
src/coreclr/runtime/portable/AllocFast.cpp	Updates fast alloc helpers to prepare/pass transition args (TransitionBlock) under the WASM ABI.
src/coreclr/runtime/MiscNativeHelpers.h	Adds WASM helper macros for preparing/passing TransitionBlock based on callersStackPointer sentinel.

[pavelsavara]

This breaks CI ☹️ (it's in-tree coreCLR)

Log

D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:22:5: error: unknown type name 'NOINLINE'
22 | NOINLINE static void CallFunc_F64_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:24:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:29:5: error: unknown type name 'NOINLINE'
29 | NOINLINE static void CallFunc_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:31:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
31 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:36:5: error: unknown type name 'NOINLINE'
36 | NOINLINE static void CallFunc_F64_I32_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:38:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
38 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^

[radekdoulik]

Indeed, it was masked by known build issue

#127177 should fix it

[davidwrighton]

• This includes some initial work where there is a predefined set of new thunks generated into the coreclr codebase. I expect that we'll build some sort of hardcoded list here for invokes to/from R2R code, and then have R2R supplement the list with extra cases.
• Adjust PortableEntryPoint calling convention to match the WASM version
• Update PortableEntryPoint::HasNativeEntryPoint to indicate that the NativeEntryPoint is the intentional target
• Update the calls from R2R into interpreter to capture the stack argument into the TransitionBlock
• Update all of the FCDECL/FCIMPL macros to capture the stack correctly
• Adjust the various FCalls which should capture a TransitionBlock to capture one from the callersStackPointer parameter to FCalls.
• Implement correct signature mapping for PortableEntryPoints which are FCalls
• Update interp to managed helpers to pass a stack pointer which informs the stack walker to stop walking
• Put the callers frame pointer into the TransitionBlock. To do so, I've added a new m_StackPointer field to the TransitionBlock
• Make the ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex function into functionally being the Prestub when called from R2R.
• Add m_StackPointer to TransitionBlock, and put the callers stack pointer in there.
• Update helper calls in interpexec to setup the stack pointer argument correctly

Fixes#123437

[dotnet-policy-service]

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

[Copilot]

Pull request overview

This PR updates CoreCLR’s WASM PortableEntryPoint and interpreter interop to support scenarios where R2R code calls through PortableEntryPoints that may ultimately target native entrypoints, including new thunk/signature handling and stack-walk termination plumbing.

Changes:

• Extend signature generation and thunk tables to distinguish PortableEntryPoint calls (via a 'p' suffix) and to include InternalCall/FCall shapes.
• Add/adjust WASM-side thunk implementations and runtime lookup/caching for R2R→interpreter and interpreter→native dispatch.
• Update PortableEntryPoint state tracking (preferring interpreter vs native) and propagate a stack-walk termination/stack pointer through TransitionBlock and helper call paths.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pregenerated signatures; writes cache as UTF-8.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct _PE call thunks for signatures ending in 'p' (PortableEntryPoint context).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans for MethodImplAttributes.InternalCall and emits 'p'-suffixed signatures.
src/coreclr/vm/wasm/helpers.cpp	Adds hardcoded R2R→interpreter thunks, PortableEntryPoint thunk cache, and signature key support for 'p' suffix.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated interpreter→native thunk implementations for PortableEntryPoint calls (*_PE) and signature table entries.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint-aware interpreted execution path that can run prestub work and dispatch to compiled code.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag and accessors.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint/SetActualCode semantics around “prefer interpreter” state.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoints with an optional R2R→interpreter thunk and marks them as preferring interpreter initially.
src/coreclr/vm/jithelpers.cpp	Updates WASM helper wrappers to pass stack-walk termination/TransitionBlock info into _Impl variants.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod prototype for PortableEntryPoint prestub dispatch use.
src/coreclr/vm/interpexec.cpp	Adds macros/typedefs to pass PortableEntryPoint stack/context args through helper calls; adjusts PortableEntryPoint native-entrypoint gating.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use GC flags instead of a bool.
src/coreclr/vm/frames.h	Changes GCFrame API from BOOL maybeInterior to UINT gcFlags and updates protection macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame behavior using gcFlags and asserts flag expectations.
src/coreclr/vm/fcall.h	Adjusts WASM FCALL/HCALL signatures to include hidden stack/context parameters.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock for WASM exception context.
src/coreclr/vm/eetwain.cpp	Ensures WASM TransitionBlock has stack pointer set for funclet calls.
src/coreclr/vm/callingconvention.h	Adds m_StackPointer overlay in WASM TransitionBlock.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates an internal FCALL-to-FCALL call site to pass the new WASM hidden parameters explicitly.

[Copilot]

Pull request overview

This PR updates the CoreCLR WASM PortableEntryPoint calling convention and thunk/signature infrastructure to support ReadyToRun (R2R) native entrypoints while preserving correct interpreter dispatch and stack-walking behavior.

Changes:

• Extends WASM signature generation to account for PortableEntryPoint context ('p') and InternalCall/FCall signature shapes.
• Adds R2R-to-interpreter thunk support, including capturing the caller stack pointer into TransitionBlock and using it to terminate/limit stack walking.
• Adjusts PortableEntryPoint state management and prestub-like behavior to correctly resolve interpreter vs native (R2R) targets.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this to signature mapping for instance methods.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Replaces icall table generation with InternalCall signature collection and adds pregenerated signature shapes.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct call thunks for PortableEntryPoint calls (extra hidden params + stack-walk termination).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New scanner to collect InternalCall signatures for thunk generation.
src/coreclr/vm/wasm/helpers.cpp	Adds R2R→interpreter thunk table/cache and updates managed calli invocation to carry PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates reverse-thunk exports and signature naming adjustments.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk table to include PE-aware signatures and call patterns.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves like prestub when invoked from R2R.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag/accessors and updates PortableEntryPoint API surface.
src/coreclr/vm/precode_portable.cpp	Updates native-entrypoint detection and allows “upgrade” from interpreter-preferred to actual code.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoint with an R2R→interpreter thunk when available and sets interpreter-preferred state.
src/coreclr/vm/jithelpers.cpp	WASM FCALL wrappers now pass stack pointer / transition info to exception helpers.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod for prestub/R2R dispatch paths.
src/coreclr/vm/interpexec.cpp	Adjusts helper calling patterns and PortableEntryPoint selection logic; threads stack-pointer through transition blocks.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to new ctor parameterization (gcFlags).
src/coreclr/vm/frames.h	Changes GCFrame API from maybeInterior to gcFlags and updates GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame gcFlags handling and enforces interior-flag expectations.
src/coreclr/vm/fcall.h	Updates FCALL/HCALL macro signatures for WASM to include hidden stack/context args.
src/coreclr/vm/excep.cpp	Plumbs interpreter stack pointer from TransitionBlock into exception frame context.
src/coreclr/vm/eetwain.cpp	Ensures WASM transition blocks set stack pointer consistently for funclet calls.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock to carry m_StackPointer.
src/coreclr/vm/callhelpers.h	Adds TERMINATE_R2R_STACK_WALK sentinel for WASM stack-walk termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates a FCALL wrapper to supply explicit hidden args under new WASM calling convention.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint plumbing to support ReadyToRun (R2R) native entrypoints and correct calling conventions/signature handling across interpreter ↔ native transitions (including FCalls), with additional stack-walk/TransitionBlock support.

Changes:

• Extend signature generation/mapping to support PortableEntryPoint context (p) and InternalCall (FCall) signatures; update thunk generation accordingly.
• Add initial hardcoded R2R→interpreter PortableEntryPoint thunk set and associated lookup/caching paths; adjust prestub-style dispatch for PortableEntryPoint calls.
• Update runtime structures/paths for WASM stack-walk termination and TransitionBlock stack pointer propagation; refactor GCFrame to use GC flag bitmasks.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection; adds pregenerated signature list.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct PE thunks (extra hidden params + stack-walk sentinel) and maps ...p signatures.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector for InternalCall method signatures (for PE thunk generation).
src/coreclr/vm/wasm/helpers.cpp	Adds PE thunk table + lookup; appends p to default-callconv signature keys; updates managed calli cookie invocation shape; adds thunk lookup for R2R→interp.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk implementations + table entries for ...p (PortableEntryPoint) signatures.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates generated reverse thunks and some signatures/entry mappings.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves prestub-like and can dispatch to R2R via InvokeManagedMethod.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag API to PortableEntryPoint.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and SetActualCode behavior with PrefersInterpreterEntryPoint.
src/coreclr/vm/method.cpp	Uses R2R→interp thunk when available and sets PrefersInterpreterEntryPoint on new PortableEntryPoints.
src/coreclr/vm/jithelpers.cpp	Updates WASM IL_Throw/IL_Rethrow/IL_ThrowExact wrappers to incorporate TransitionBlock/stack pointer logic.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration for new prestub path usage.
src/coreclr/vm/interpexec.cpp	Adds helper-call wrappers for WASM portable-entrypoint calling convention; updates PortableEntryPoint/native-entrypoint selection logic.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock storage with a unioned stack pointer field.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking.
src/coreclr/vm/frames.h	Updates GCFrame ctor signature (bool → flags) and adjusts GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame flag-based scanning behavior.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to pass GC flags.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint call later in IL stub creation.
src/coreclr/vm/fcall.h	Adjusts FCALL/HCALL signature macros for TARGET_WASM to include hidden params.
src/coreclr/vm/excep.cpp	Plumbs TransitionBlock stack pointer into SoftwareExceptionFrame context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer for WASM funclet path.
src/coreclr/runtime/portable/AllocFast.cpp	Updates RhpNewPtrArrayFast to match new WASM FCALL signature shape.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint / FCALL calling-convention plumbing to support scenarios where ReadyToRun (R2R) code has native entrypoints, including new/updated WASM thunk generation and TransitionBlock stack-pointer propagation.

Changes:

• Extend managed→native thunk signature generation to support PortableEntryPoint (“…p”) signatures and collect InternalCall shapes from System.Private.CoreLib.
• Add WASM-side thunk caches and interpreter dispatch paths to correctly pass PortableEntryPoint context and a stack-walk termination sentinel via TransitionBlock.
• Update FCALL/HCALL/GCFrame/PortableEntryPoint infrastructure to carry stack pointer state and prefer interpreter entrypoints until native code is available.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Add optional inclusion of this in signature encoding.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switch to InternalCall signature collection; add pregenerated PE signatures; UTF-8 cache write.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generate distinct PE thunk entrypoints and signatures with PE suffix handling.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New: scan CoreLib for InternalCall methods and emit PE thunk signatures.
src/coreclr/vm/wasm/helpers.hpp	New: startup init hook for wasm thunk caches.
src/coreclr/vm/wasm/helpers.cpp	Add PE thunk tables/caches; update calli cookie calling convention; init caches at startup.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Update reverse thunks/signatures to match new calling convention expectations.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Add “_PE” call thunks that pass PE context + stack-walk sentinel.
src/coreclr/vm/tailcallhelp.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/stubhelpers.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/runtimehandles.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/reflectioninvocation.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/prestub.cpp	Add PortableEntryPoint “complex” interpreter entry path behaving like prestub for R2R.
src/coreclr/vm/precode_portable.hpp	Add “prefers interpreter entrypoint” flag + APIs.
src/coreclr/vm/precode_portable.cpp	Adjust HasNativeEntryPoint logic; clear prefer-interpreter flag on upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Convert selected alloc helpers to FCIMPL + TransitionBlock-aware calling convention.
src/coreclr/vm/method.hpp	Add MethodDesc helper to initialize PE initial state.
src/coreclr/vm/method.cpp	Initialize/reset PE based on available PE→interp thunk; default to prefer-interpreter.
src/coreclr/vm/marshalnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/managedmdimport.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/jithelpers.cpp	WASM: build TransitionBlock for throw helpers using callersStackPointer sentinel logic.
src/coreclr/vm/interpexec.h	Expose InvokeManagedMethod for PortableEntryPoint prestub-like flow.
src/coreclr/vm/interpexec.cpp	Update helper-call sites to new calling convention; integrate prefer-interpreter logic.
src/coreclr/vm/ilstubcache.cpp	Move temporary entrypoint assignment after signature/flags setup.
src/coreclr/vm/gccover.cpp	Update GCFrame ctor usage to new gcFlags model.
src/coreclr/vm/frames.h	Replace maybeInterior bool with gcFlags.
src/coreclr/vm/frames.cpp	Implement gcFlags-based scanning behavior for GCFrame.
src/coreclr/vm/fcall.h	WASM: introduce wrapper/impl calling convention capture for callersStackPointer + PE context.
src/coreclr/vm/excep.cpp	Update TransitionBlock-derived interpreter context capture in exception frame.
src/coreclr/vm/eetwain.cpp	Ensure TransitionBlock stack pointer is initialized for WASM funclet calls.
src/coreclr/vm/ecall.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/dynamicmethod.cpp	Adjust contract mode + Reset ordering relative to signature/flags.
src/coreclr/vm/comutilnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comsynchronizable.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/commodule.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdependenthandle.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdelegate.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/ceemain.cpp	WASM: initialize thunk caches during EEStartup.
src/coreclr/vm/callingconvention.h	WASM: add m_StackPointer union member in TransitionBlock.
src/coreclr/vm/callhelpers.h	WASM: add TERMINATE_R2R_STACK_WALK sentinel definition.
src/coreclr/vm/assemblynative.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/arraynative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/runtime/portable/WriteBarriers.cpp	Convert write barrier stubs to FCIMPL for new WASM convention.
src/coreclr/runtime/portable/AllocFast.cpp	Add TransitionBlock-aware calling convention + helper macros; convert to FCIMPL.
src/coreclr/runtime/MiscNativeHelpers.h	Add PREPARE_TRANSITION_ARG helper for WASM/non-NativeAOT.

[radekdoulik]

I tried to run priority1 runtime tests and I see few failures. I will need to rerun it on main too, to see if it is introduced here or whether we regressed on main meanwhile. Doesn't need to block this PR though, we can fix it in a follow up PR. Just want to let you know.

Note for me: I should enable priority1 tests in the outer loop.

[radekdoulik]

LGTM, thank you!

[Copilot]

Pull request overview

This PR updates CoreCLR WASM portable entry point and FCall calling convention plumbing to support R2R/native entrypoints, including stack-pointer capture/propagation needed for correct transition handling and future stack walking on WASM. It also extends the WASM app builder codegen to generate (and pre-seed) additional thunk signatures, including InternalCall-driven portable entry point thunks.

Changes:

• Extend WASM thunk/signature generation to include InternalCall portable-entry-point shapes and pre-generated common signatures.
• Add WASM runtime support for portable-entry-point → interpreter thunks, thunk caches, and updated calli cookie invocation.
• Update portable entry point state/flags and transition block handling to carry a stack pointer, plus broad FCDECL/FCIMPL macro/call-site adjustments for the WASM ABI.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Allows optional inclusion of this in generated signatures (used for InternalCall scanning).
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pre-generated PE signatures.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates separate thunk entrypoints for portable entry point calls (extra hidden context + frame-pointer arg).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans System.Private.CoreLib InternalCalls and emits PE signatures.
src/coreclr/vm/wasm/helpers.hpp	Declares InitializeWasmThunkCaches for explicit EEStartup initialization.
src/coreclr/vm/wasm/helpers.cpp	Adds PE→interpreter thunk table/caches, updates thunk lookup/init, and adjusts calli invocation to pass PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates/renames some reverse thunks and signatures to align with updated calling convention shapes.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Adds PE-specific thunk entrypoints (extra frame-pointer + PE context) and updates thunk map keys.
src/coreclr/vm/tailcallhelp.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/stubhelpers.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/runtimehandles.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/reflectioninvocation.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path to act like prestub for R2R vs interpreter dispatch on WASM.
src/coreclr/vm/precode_portable.hpp	Adds “prefers interpreter entry point” flag and API surface.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and clears the “prefer interpreter” flag on code upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Updates allocator FCALLs to capture/pass a transition block under the new WASM calling convention.
src/coreclr/vm/method.hpp	Adds helper to initialize portable entry point state based on method characteristics.
src/coreclr/vm/method.cpp	Initializes portable entry points with optional PE→interp thunk and sets initial “prefer interpreter” state.
src/coreclr/vm/marshalnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/managedmdimport.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/jithelpers.cpp	Adjusts WASM FCALL wrappers to provide TransitionBlock context based on callers’ stack pointer sentinel.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration needed by new prestub-like PE path.
src/coreclr/vm/interpexec.cpp	Updates helper call patterns for PE ABI (frame-pointer + hidden args) and PE/native-entrypoint preference logic.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later to ensure dynamic method state is initialized first.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use flag-based interior tracking.
src/coreclr/vm/frames.h	Changes GCFrame ctor signature (flags instead of bool) and updates GCPROTECT macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame flag storage/scanning semantics and asserts correct interior-flag usage.
src/coreclr/vm/fcall.h	Adds WASM FCALL ABI support (hidden callersStackPointer + PE context) and wrapper generation macros.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock into exception context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer in WASM funclet path.
src/coreclr/vm/ecall.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/dynamicmethod.cpp	Adjusts contract mode and reorders Reset() to occur after signature/flags are set (WASM needs signature inspection).
src/coreclr/vm/comutilnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comsynchronizable.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/commodule.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdependenthandle.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdelegate.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/ceemain.cpp	Calls InitializeWasmThunkCaches() during EE startup on WASM.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock layout to carry a stack pointer (union overlay).
src/coreclr/vm/callhelpers.h	Adds WASM sentinel TERMINATE_R2R_STACK_WALK for stack-walk termination.
src/coreclr/vm/assemblynative.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/arraynative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/runtime/portable/WriteBarriers.cpp	Wraps portable write barrier stubs in FCIMPL for updated FCALL handling.
src/coreclr/runtime/portable/AllocFast.cpp	Updates fast alloc helpers to prepare/pass transition args (TransitionBlock) under the WASM ABI.
src/coreclr/runtime/MiscNativeHelpers.h	Adds WASM helper macros for preparing/passing TransitionBlock based on callersStackPointer sentinel.

[pavelsavara]

This breaks CI ☹️ (it's in-tree coreCLR)

Log

D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:22:5: error: unknown type name 'NOINLINE'
22 | NOINLINE static void CallFunc_F64_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:24:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:29:5: error: unknown type name 'NOINLINE'
29 | NOINLINE static void CallFunc_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:31:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
31 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:36:5: error: unknown type name 'NOINLINE'
36 | NOINLINE static void CallFunc_F64_I32_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:38:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
38 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^

[radekdoulik]

Indeed, it was masked by known build issue

#127177 should fix it

[davidwrighton]

• This includes some initial work where there is a predefined set of new thunks generated into the coreclr codebase. I expect that we'll build some sort of hardcoded list here for invokes to/from R2R code, and then have R2R supplement the list with extra cases.
• Adjust PortableEntryPoint calling convention to match the WASM version
• Update PortableEntryPoint::HasNativeEntryPoint to indicate that the NativeEntryPoint is the intentional target
• Update the calls from R2R into interpreter to capture the stack argument into the TransitionBlock
• Update all of the FCDECL/FCIMPL macros to capture the stack correctly
• Adjust the various FCalls which should capture a TransitionBlock to capture one from the callersStackPointer parameter to FCalls.
• Implement correct signature mapping for PortableEntryPoints which are FCalls
• Update interp to managed helpers to pass a stack pointer which informs the stack walker to stop walking
• Put the callers frame pointer into the TransitionBlock. To do so, I've added a new m_StackPointer field to the TransitionBlock
• Make the ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex function into functionally being the Prestub when called from R2R.
• Add m_StackPointer to TransitionBlock, and put the callers stack pointer in there.
• Update helper calls in interpexec to setup the stack pointer argument correctly

Fixes#123437

[dotnet-policy-service]

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

[Copilot]

Pull request overview

This PR updates CoreCLR’s WASM PortableEntryPoint and interpreter interop to support scenarios where R2R code calls through PortableEntryPoints that may ultimately target native entrypoints, including new thunk/signature handling and stack-walk termination plumbing.

Changes:

• Extend signature generation and thunk tables to distinguish PortableEntryPoint calls (via a 'p' suffix) and to include InternalCall/FCall shapes.
• Add/adjust WASM-side thunk implementations and runtime lookup/caching for R2R→interpreter and interpreter→native dispatch.
• Update PortableEntryPoint state tracking (preferring interpreter vs native) and propagate a stack-walk termination/stack pointer through TransitionBlock and helper call paths.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pregenerated signatures; writes cache as UTF-8.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct _PE call thunks for signatures ending in 'p' (PortableEntryPoint context).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans for MethodImplAttributes.InternalCall and emits 'p'-suffixed signatures.
src/coreclr/vm/wasm/helpers.cpp	Adds hardcoded R2R→interpreter thunks, PortableEntryPoint thunk cache, and signature key support for 'p' suffix.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated interpreter→native thunk implementations for PortableEntryPoint calls (*_PE) and signature table entries.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint-aware interpreted execution path that can run prestub work and dispatch to compiled code.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag and accessors.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint/SetActualCode semantics around “prefer interpreter” state.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoints with an optional R2R→interpreter thunk and marks them as preferring interpreter initially.
src/coreclr/vm/jithelpers.cpp	Updates WASM helper wrappers to pass stack-walk termination/TransitionBlock info into _Impl variants.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod prototype for PortableEntryPoint prestub dispatch use.
src/coreclr/vm/interpexec.cpp	Adds macros/typedefs to pass PortableEntryPoint stack/context args through helper calls; adjusts PortableEntryPoint native-entrypoint gating.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use GC flags instead of a bool.
src/coreclr/vm/frames.h	Changes GCFrame API from BOOL maybeInterior to UINT gcFlags and updates protection macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame behavior using gcFlags and asserts flag expectations.
src/coreclr/vm/fcall.h	Adjusts WASM FCALL/HCALL signatures to include hidden stack/context parameters.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock for WASM exception context.
src/coreclr/vm/eetwain.cpp	Ensures WASM TransitionBlock has stack pointer set for funclet calls.
src/coreclr/vm/callingconvention.h	Adds m_StackPointer overlay in WASM TransitionBlock.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates an internal FCALL-to-FCALL call site to pass the new WASM hidden parameters explicitly.

[Copilot]

Pull request overview

This PR updates the CoreCLR WASM PortableEntryPoint calling convention and thunk/signature infrastructure to support ReadyToRun (R2R) native entrypoints while preserving correct interpreter dispatch and stack-walking behavior.

Changes:

• Extends WASM signature generation to account for PortableEntryPoint context ('p') and InternalCall/FCall signature shapes.
• Adds R2R-to-interpreter thunk support, including capturing the caller stack pointer into TransitionBlock and using it to terminate/limit stack walking.
• Adjusts PortableEntryPoint state management and prestub-like behavior to correctly resolve interpreter vs native (R2R) targets.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this to signature mapping for instance methods.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Replaces icall table generation with InternalCall signature collection and adds pregenerated signature shapes.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct call thunks for PortableEntryPoint calls (extra hidden params + stack-walk termination).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New scanner to collect InternalCall signatures for thunk generation.
src/coreclr/vm/wasm/helpers.cpp	Adds R2R→interpreter thunk table/cache and updates managed calli invocation to carry PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates reverse-thunk exports and signature naming adjustments.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk table to include PE-aware signatures and call patterns.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves like prestub when invoked from R2R.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag/accessors and updates PortableEntryPoint API surface.
src/coreclr/vm/precode_portable.cpp	Updates native-entrypoint detection and allows “upgrade” from interpreter-preferred to actual code.
src/coreclr/vm/method.cpp	Initializes PortableEntryPoint with an R2R→interpreter thunk when available and sets interpreter-preferred state.
src/coreclr/vm/jithelpers.cpp	WASM FCALL wrappers now pass stack pointer / transition info to exception helpers.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod for prestub/R2R dispatch paths.
src/coreclr/vm/interpexec.cpp	Adjusts helper calling patterns and PortableEntryPoint selection logic; threads stack-pointer through transition blocks.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later in IL stub creation sequence.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to new ctor parameterization (gcFlags).
src/coreclr/vm/frames.h	Changes GCFrame API from maybeInterior to gcFlags and updates GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame gcFlags handling and enforces interior-flag expectations.
src/coreclr/vm/fcall.h	Updates FCALL/HCALL macro signatures for WASM to include hidden stack/context args.
src/coreclr/vm/excep.cpp	Plumbs interpreter stack pointer from TransitionBlock into exception frame context.
src/coreclr/vm/eetwain.cpp	Ensures WASM transition blocks set stack pointer consistently for funclet calls.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock to carry m_StackPointer.
src/coreclr/vm/callhelpers.h	Adds TERMINATE_R2R_STACK_WALK sentinel for WASM stack-walk termination.
src/coreclr/runtime/portable/AllocFast.cpp	Updates a FCALL wrapper to supply explicit hidden args under new WASM calling convention.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint plumbing to support ReadyToRun (R2R) native entrypoints and correct calling conventions/signature handling across interpreter ↔ native transitions (including FCalls), with additional stack-walk/TransitionBlock support.

Changes:

• Extend signature generation/mapping to support PortableEntryPoint context (p) and InternalCall (FCall) signatures; update thunk generation accordingly.
• Add initial hardcoded R2R→interpreter PortableEntryPoint thunk set and associated lookup/caching paths; adjust prestub-style dispatch for PortableEntryPoint calls.
• Update runtime structures/paths for WASM stack-walk termination and TransitionBlock stack pointer propagation; refactor GCFrame to use GC flag bitmasks.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Adds optional inclusion of this in computed signatures.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection; adds pregenerated signature list.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates distinct PE thunks (extra hidden params + stack-walk sentinel) and maps ...p signatures.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector for InternalCall method signatures (for PE thunk generation).
src/coreclr/vm/wasm/helpers.cpp	Adds PE thunk table + lookup; appends p to default-callconv signature keys; updates managed calli cookie invocation shape; adds thunk lookup for R2R→interp.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Updates generated thunk implementations + table entries for ...p (PortableEntryPoint) signatures.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates generated reverse thunks and some signatures/entry mappings.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path that behaves prestub-like and can dispatch to R2R via InvokeManagedMethod.
src/coreclr/vm/precode_portable.hpp	Adds PrefersInterpreterEntryPoint flag API to PortableEntryPoint.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and SetActualCode behavior with PrefersInterpreterEntryPoint.
src/coreclr/vm/method.cpp	Uses R2R→interp thunk when available and sets PrefersInterpreterEntryPoint on new PortableEntryPoints.
src/coreclr/vm/jithelpers.cpp	Updates WASM IL_Throw/IL_Rethrow/IL_ThrowExact wrappers to incorporate TransitionBlock/stack pointer logic.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration for new prestub path usage.
src/coreclr/vm/interpexec.cpp	Adds helper-call wrappers for WASM portable-entrypoint calling convention; updates PortableEntryPoint/native-entrypoint selection logic.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock storage with a unioned stack pointer field.
src/coreclr/vm/callhelpers.h	Introduces TERMINATE_R2R_STACK_WALK sentinel for WASM stack walking.
src/coreclr/vm/frames.h	Updates GCFrame ctor signature (bool → flags) and adjusts GCPROTECT macros.
src/coreclr/vm/frames.cpp	Implements GCFrame flag-based scanning behavior.
src/coreclr/vm/gccover.cpp	Updates GCFrame usage to pass GC flags.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint call later in IL stub creation.
src/coreclr/vm/fcall.h	Adjusts FCALL/HCALL signature macros for TARGET_WASM to include hidden params.
src/coreclr/vm/excep.cpp	Plumbs TransitionBlock stack pointer into SoftwareExceptionFrame context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer for WASM funclet path.
src/coreclr/runtime/portable/AllocFast.cpp	Updates RhpNewPtrArrayFast to match new WASM FCALL signature shape.

[Copilot]

Pull request overview

This PR updates CoreCLR WASM PortableEntryPoint / FCALL calling-convention plumbing to support scenarios where ReadyToRun (R2R) code has native entrypoints, including new/updated WASM thunk generation and TransitionBlock stack-pointer propagation.

Changes:

• Extend managed→native thunk signature generation to support PortableEntryPoint (“…p”) signatures and collect InternalCall shapes from System.Private.CoreLib.
• Add WASM-side thunk caches and interpreter dispatch paths to correctly pass PortableEntryPoint context and a stack-walk termination sentinel via TransitionBlock.
• Update FCALL/HCALL/GCFrame/PortableEntryPoint infrastructure to carry stack pointer state and prefer interpreter entrypoints until native code is available.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Add optional inclusion of this in signature encoding.
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switch to InternalCall signature collection; add pregenerated PE signatures; UTF-8 cache write.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generate distinct PE thunk entrypoints and signatures with PE suffix handling.
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New: scan CoreLib for InternalCall methods and emit PE thunk signatures.
src/coreclr/vm/wasm/helpers.hpp	New: startup init hook for wasm thunk caches.
src/coreclr/vm/wasm/helpers.cpp	Add PE thunk tables/caches; update calli cookie calling convention; init caches at startup.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Update reverse thunks/signatures to match new calling convention expectations.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Add “_PE” call thunks that pass PE context + stack-walk sentinel.
src/coreclr/vm/tailcallhelp.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/stubhelpers.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/runtimehandles.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/reflectioninvocation.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/prestub.cpp	Add PortableEntryPoint “complex” interpreter entry path behaving like prestub for R2R.
src/coreclr/vm/precode_portable.hpp	Add “prefers interpreter entrypoint” flag + APIs.
src/coreclr/vm/precode_portable.cpp	Adjust HasNativeEntryPoint logic; clear prefer-interpreter flag on upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Convert selected alloc helpers to FCIMPL + TransitionBlock-aware calling convention.
src/coreclr/vm/method.hpp	Add MethodDesc helper to initialize PE initial state.
src/coreclr/vm/method.cpp	Initialize/reset PE based on available PE→interp thunk; default to prefer-interpreter.
src/coreclr/vm/marshalnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/managedmdimport.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/jithelpers.cpp	WASM: build TransitionBlock for throw helpers using callersStackPointer sentinel logic.
src/coreclr/vm/interpexec.h	Expose InvokeManagedMethod for PortableEntryPoint prestub-like flow.
src/coreclr/vm/interpexec.cpp	Update helper-call sites to new calling convention; integrate prefer-interpreter logic.
src/coreclr/vm/ilstubcache.cpp	Move temporary entrypoint assignment after signature/flags setup.
src/coreclr/vm/gccover.cpp	Update GCFrame ctor usage to new gcFlags model.
src/coreclr/vm/frames.h	Replace maybeInterior bool with gcFlags.
src/coreclr/vm/frames.cpp	Implement gcFlags-based scanning behavior for GCFrame.
src/coreclr/vm/fcall.h	WASM: introduce wrapper/impl calling convention capture for callersStackPointer + PE context.
src/coreclr/vm/excep.cpp	Update TransitionBlock-derived interpreter context capture in exception frame.
src/coreclr/vm/eetwain.cpp	Ensure TransitionBlock stack pointer is initialized for WASM funclet calls.
src/coreclr/vm/ecall.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/dynamicmethod.cpp	Adjust contract mode + Reset ordering relative to signature/flags.
src/coreclr/vm/comutilnative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comsynchronizable.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/commodule.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdependenthandle.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/comdelegate.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/ceemain.cpp	WASM: initialize thunk caches during EEStartup.
src/coreclr/vm/callingconvention.h	WASM: add m_StackPointer union member in TransitionBlock.
src/coreclr/vm/callhelpers.h	WASM: add TERMINATE_R2R_STACK_WALK sentinel definition.
src/coreclr/vm/assemblynative.hpp	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/vm/arraynative.h	Update FCDECL macro usage style to accommodate new signatures.
src/coreclr/runtime/portable/WriteBarriers.cpp	Convert write barrier stubs to FCIMPL for new WASM convention.
src/coreclr/runtime/portable/AllocFast.cpp	Add TransitionBlock-aware calling convention + helper macros; convert to FCIMPL.
src/coreclr/runtime/MiscNativeHelpers.h	Add PREPARE_TRANSITION_ARG helper for WASM/non-NativeAOT.

[radekdoulik]

I tried to run priority1 runtime tests and I see few failures. I will need to rerun it on main too, to see if it is introduced here or whether we regressed on main meanwhile. Doesn't need to block this PR though, we can fix it in a follow up PR. Just want to let you know.

Note for me: I should enable priority1 tests in the outer loop.

[radekdoulik]

LGTM, thank you!

[Copilot]

Pull request overview

This PR updates CoreCLR WASM portable entry point and FCall calling convention plumbing to support R2R/native entrypoints, including stack-pointer capture/propagation needed for correct transition handling and future stack walking on WASM. It also extends the WASM app builder codegen to generate (and pre-seed) additional thunk signatures, including InternalCall-driven portable entry point thunks.

Changes:

• Extend WASM thunk/signature generation to include InternalCall portable-entry-point shapes and pre-generated common signatures.
• Add WASM runtime support for portable-entry-point → interpreter thunks, thunk caches, and updated calli cookie invocation.
• Update portable entry point state/flags and transition block handling to carry a stack pointer, plus broad FCDECL/FCIMPL macro/call-site adjustments for the WASM ABI.

Reviewed changes

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

Show a summary per file

File	Description
src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs	Allows optional inclusion of this in generated signatures (used for InternalCall scanning).
src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs	Switches from icall table generation to InternalCall signature collection + pre-generated PE signatures.
src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs	Generates separate thunk entrypoints for portable entry point calls (extra hidden context + frame-pointer arg).
src/tasks/WasmAppBuilder/coreclr/InternalCallSignatureCollector.cs	New collector that scans System.Private.CoreLib InternalCalls and emits PE signatures.
src/coreclr/vm/wasm/helpers.hpp	Declares InitializeWasmThunkCaches for explicit EEStartup initialization.
src/coreclr/vm/wasm/helpers.cpp	Adds PE→interpreter thunk table/caches, updates thunk lookup/init, and adjusts calli invocation to pass PE context.
src/coreclr/vm/wasm/callhelpers-reverse.cpp	Updates/renames some reverse thunks and signatures to align with updated calling convention shapes.
src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp	Adds PE-specific thunk entrypoints (extra frame-pointer + PE context) and updates thunk map keys.
src/coreclr/vm/tailcallhelp.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/stubhelpers.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/runtimehandles.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/reflectioninvocation.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/prestub.cpp	Adds PortableEntryPoint “complex” path to act like prestub for R2R vs interpreter dispatch on WASM.
src/coreclr/vm/precode_portable.hpp	Adds “prefers interpreter entry point” flag and API surface.
src/coreclr/vm/precode_portable.cpp	Updates HasNativeEntryPoint semantics and clears the “prefer interpreter” flag on code upgrade.
src/coreclr/vm/portable/AllocSlow.cpp	Updates allocator FCALLs to capture/pass a transition block under the new WASM calling convention.
src/coreclr/vm/method.hpp	Adds helper to initialize portable entry point state based on method characteristics.
src/coreclr/vm/method.cpp	Initializes portable entry points with optional PE→interp thunk and sets initial “prefer interpreter” state.
src/coreclr/vm/marshalnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/managedmdimport.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/jithelpers.cpp	Adjusts WASM FCALL wrappers to provide TransitionBlock context based on callers’ stack pointer sentinel.
src/coreclr/vm/interpexec.h	Exposes InvokeManagedMethod declaration needed by new prestub-like PE path.
src/coreclr/vm/interpexec.cpp	Updates helper call patterns for PE ABI (frame-pointer + hidden args) and PE/native-entrypoint preference logic.
src/coreclr/vm/ilstubcache.cpp	Moves SetTemporaryEntryPoint later to ensure dynamic method state is initialized first.
src/coreclr/vm/gccover.cpp	Updates GCFrame construction to use flag-based interior tracking.
src/coreclr/vm/frames.h	Changes GCFrame ctor signature (flags instead of bool) and updates GCPROTECT macros accordingly.
src/coreclr/vm/frames.cpp	Implements GCFrame flag storage/scanning semantics and asserts correct interior-flag usage.
src/coreclr/vm/fcall.h	Adds WASM FCALL ABI support (hidden callersStackPointer + PE context) and wrapper generation macros.
src/coreclr/vm/excep.cpp	Records interpreter stack pointer from TransitionBlock into exception context on WASM.
src/coreclr/vm/eetwain.cpp	Initializes TransitionBlock stack pointer in WASM funclet path.
src/coreclr/vm/ecall.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/dynamicmethod.cpp	Adjusts contract mode and reorders Reset() to occur after signature/flags are set (WASM needs signature inspection).
src/coreclr/vm/comutilnative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comsynchronizable.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/commodule.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdependenthandle.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/comdelegate.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/ceemain.cpp	Calls InitializeWasmThunkCaches() during EE startup on WASM.
src/coreclr/vm/callingconvention.h	Extends WASM TransitionBlock layout to carry a stack pointer (union overlay).
src/coreclr/vm/callhelpers.h	Adds WASM sentinel TERMINATE_R2R_STACK_WALK for stack-walk termination.
src/coreclr/vm/assemblynative.hpp	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/vm/arraynative.h	Converts FCDECL usage to new macro placement pattern for static members.
src/coreclr/runtime/portable/WriteBarriers.cpp	Wraps portable write barrier stubs in FCIMPL for updated FCALL handling.
src/coreclr/runtime/portable/AllocFast.cpp	Updates fast alloc helpers to prepare/pass transition args (TransitionBlock) under the WASM ABI.
src/coreclr/runtime/MiscNativeHelpers.h	Adds WASM helper macros for preparing/passing TransitionBlock based on callersStackPointer sentinel.

[pavelsavara]

This breaks CI ☹️ (it's in-tree coreCLR)

Log

D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:22:5: error: unknown type name 'NOINLINE'
22 | NOINLINE static void CallFunc_F64_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:24:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:29:5: error: unknown type name 'NOINLINE'
29 | NOINLINE static void CallFunc_F64_F64_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:31:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
31 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:36:5: error: unknown type name 'NOINLINE'
36 | NOINLINE static void CallFunc_F64_I32_RetF64_PE(PCODE pcode, int8_t* pArgs, int8_t* pRet, PCODE pPortableEntryPointContext)
| ^
D:\a\_work\1\s\artifacts\obj\mono\Wasm.BrowserLogProfile.Sample\browser.wasm.Release\wasm\for-build\wasm_m2n_invoke.g.cpp:38:40: error: use of undeclared identifier 'TERMINATE_R2R_STACK_WALK'
38 | alignas(16) int framePointer = TERMINATE_R2R_STACK_WALK;
| ^

[radekdoulik]

Indeed, it was masked by known build issue

#127177 should fix it