[Wasm RyuJit] Type Index Relocation Support in Wasm Object Writer by adamperlin · Pull Request #124685 · dotnet/runtime

adamperlin · 2026-02-21T01:49:47Z

This PR adds type index relocation support to the crossgen wasm object writer.

In particular,

The new WasmTypeNode symbol now uses the WasmFuncType originally defined in the object writer, now moved to ILCompiler.DependencyAnalysis.Wasm. This type already contains code for encoding signatures
The object writer now collects WasmTypeNodes and assigns them an index in the resulting module, and will resolve any references to a particular type node to its index (resolving WASM_TYPE_INDEX_LEB relocations).

The signatures that the JIT requests are still hardcoded. To test the interface and relocation resolution, the JIT currently requests a signature of void (int, int) which is the lowered version of a void static managed method.

…er for common use in crossgen, use WasmFuncType as backing data for WasmTypeNode

…jectWriter and add support for resolving type index relocations

…-object-writer-type-relocs

…, remove unnecessary array copy when creating WasmTypeNode

Copilot

Pull request overview

This PR adds type index relocation support to the WebAssembly (Wasm) object writer for crossgen compilation. The implementation enables the object writer to collect Wasm type signatures, assign them indices, and resolve WASM_TYPE_INDEX_LEB relocations without requiring a separate linker.

Changes:

Introduces WasmFuncType and related type infrastructure by moving it from ILCompiler.ObjectWriter to ILCompiler.DependencyAnalysis.Wasm namespace
Implements relocation resolution in WasmObjectWriter to handle type index relocations
Refactors WasmTypeNode to use the new WasmFuncType and emit proper object data with symbols

Reviewed changes

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

Show a summary per file

File	Description
src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypes.cs	New file containing `WasmValueType`, `WasmResultType`, and `WasmFuncType` moved from ObjectWriter namespace with additional comparison and mangling support
src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypeNode.cs	Updated to use `WasmFuncType` instead of raw `CorInfoWasmType[]`, implements `ISymbolDefinitionNode`, and emits encoded type data
src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs	Adds relocation resolution logic, separates signature recording from method declaration, and implements section-level relocation handling
src/coreclr/tools/Common/Compiler/ObjectWriter/WasmNative.cs	Removes moved type definitions (`WasmValueType`, `WasmResultType`, `WasmFuncType`)
src/coreclr/tools/Common/Compiler/ObjectWriter/ObjectWriter.cs	Splits `RecordMethodSignature` into two methods for signatures and declarations, adjusts relocation offsets for length prefixes
src/coreclr/tools/Common/Compiler/ObjectWriter/SectionWriter.cs	Adds `HasLengthPrefix` property and `LengthPrefixSize` method for relocation offset calculations
src/coreclr/tools/Common/Compiler/DependencyAnalysis/Relocation.cs	Updates `WriteValue` and `GetSize` to handle Wasm relocation types including `WASM_TYPE_INDEX_LEB`
src/coreclr/tools/Common/JitInterface/WasmLowering.cs	Refactors to use `ArrayBuilder` for cleaner signature construction and updates namespace references
src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs	Updates namespace import from `ILCompiler.ObjectWriter` to `ILCompiler.DependencyAnalysis.Wasm`
src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs	Adds blank line for readability in `getWasmTypeSymbol` method
src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRunCodegenNodeFactory.cs	Updates to use `WasmFuncType` and implements proper equality/hashing via the type
src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj	Adds `WasmTypes.cs` to compilation
src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj	Adds `WasmTypeNode.cs` and `WasmTypes.cs` to compilation
src/coreclr/jit/emitwasm.cpp	Updates test code to use a `void (i32, i32)` signature for testing the type symbol interface

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypeNode.cs

.../tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRunCodegenNodeFactory.cs

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmNative.cs

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypes.cs

Co-authored-by: Copilot <[email protected]>

…yAnalysis/ReadyToRunCodegenNodeFactory.cs Co-authored-by: Copilot <[email protected]>

…r.cs Co-authored-by: Copilot <[email protected]>

…sm/WasmTypes.cs Co-authored-by: Copilot <[email protected]>

Copilot

Pull request overview

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

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypes.cs

…sm/WasmTypeNode.cs Co-authored-by: Copilot <[email protected]>

Copilot

Pull request overview

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

…after lifetime ends, and make lifetime of reloc resolution buffer more explicit (also avoid re-use reloc buffer for each reloc)

…gth explicitly; jit-format

src/coreclr/jit/emitwasm.cpp

Copilot

Pull request overview

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

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs

.../tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRunCodegenNodeFactory.cs

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypeNode.cs

src/coreclr/tools/Common/Compiler/ObjectWriter/ObjectWriter.cs

…r.cs Co-authored-by: Copilot <[email protected]>

adamperlin · 2026-02-25T22:24:37Z

@MichalStrehovsky thanks for the feedback, I've implemented your suggestions! Please feel free to give this another look if you have a moment!

Copilot

Pull request overview

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

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypeNode.cs

…sm/WasmTypeNode.cs Avoids unnecessary copy of `data` when constructing the `ObjectData` in WasmTypeNode.GetData` Co-authored-by: Michal Strehovský <[email protected]>

Copilot

Pull request overview

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

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypeNode.cs

…sm/WasmTypes.cs Co-authored-by: Copilot <[email protected]>

…r.cs Co-authored-by: Copilot <[email protected]>

Copilot

Pull request overview

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

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs

adamperlin · 2026-02-27T01:04:02Z

/ba-g infrastructure failures

adamperlin added 4 commits February 13, 2026 16:04

Move WasmValueType/ResultType/FuncType definitions out of object writ…

cedc59f

…er for common use in crossgen, use WasmFuncType as backing data for WasmTypeNode

Use WasmTypeNode for encoding and recording type signatures in WasmOb…

b0530ff

…jectWriter and add support for resolving type index relocations

Merge branch 'main' of github.com:dotnet/runtime into adamperlin/wasm…

94badba

…-object-writer-type-relocs

Replace WasmLowering.GetSignature implementation with patched version…

3a679b8

…, remove unnecessary array copy when creating WasmTypeNode

Copilot AI review requested due to automatic review settings February 21, 2026 01:49

github-actions bot added the area-crossgen2-coreclr label Feb 21, 2026

dotnet-policy-service bot assigned adamperlin Feb 21, 2026

Copilot started reviewing on behalf of adamperlin February 21, 2026 01:50 View session

Copilot AI reviewed Feb 21, 2026

View reviewed changes

Update src/coreclr/tools/Common/Compiler/ObjectWriter/WasmNative.cs

d95867e

Co-authored-by: Copilot <[email protected]>

Copilot AI review requested due to automatic review settings February 21, 2026 01:56

Copilot started reviewing on behalf of adamperlin February 21, 2026 01:57 View session

adamperlin and others added 5 commits February 20, 2026 17:58

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…

7fa18f7

…yAnalysis/ReadyToRunCodegenNodeFactory.cs Co-authored-by: Copilot <[email protected]>

Update src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWrite…

b4d651e

…r.cs Co-authored-by: Copilot <[email protected]>

Update src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wa…

baeb5c2

…sm/WasmTypes.cs Co-authored-by: Copilot <[email protected]>

Update src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wa…

4f9f0c8

…sm/WasmTypes.cs Co-authored-by: Copilot <[email protected]>

Update src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wa…

fa953d0

…sm/WasmTypes.cs Co-authored-by: Copilot <[email protected]>

Copilot AI reviewed Feb 21, 2026

View reviewed changes

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs Outdated Show resolved Hide resolved

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypes.cs Show resolved Hide resolved

Update src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wa…

74a4ae5

…sm/WasmTypeNode.cs Co-authored-by: Copilot <[email protected]>

Copilot AI review requested due to automatic review settings February 21, 2026 02:05

Copilot started reviewing on behalf of adamperlin February 21, 2026 02:06 View session

Copilot AI reviewed Feb 21, 2026

View reviewed changes

build-analysis bot mentioned this pull request Feb 21, 2026

[android][clr] No peer certificates when executing System.Net.Http.Functional.Tests on Android emulator #124526

Open

adamperlin added 2 commits February 23, 2026 11:52

Resolve additional copilot feedback: dispose of original data stream …

5bb1458

…after lifetime ends, and make lifetime of reloc resolution buffer more explicit (also avoid re-use reloc buffer for each reloc)

Add Relocation.MaxSize field, and check against relocation buffer len…

33e9aaa

…gth explicitly; jit-format

adamperlin marked this pull request as ready for review February 23, 2026 20:06

adamperlin requested a review from MichalStrehovsky as a code owner February 23, 2026 20:06

Copilot AI review requested due to automatic review settings February 23, 2026 20:06

Copilot started reviewing on behalf of adamperlin February 23, 2026 20:07 View session

adamperlin commented Feb 23, 2026

View reviewed changes

src/coreclr/jit/emitwasm.cpp Show resolved Hide resolved

Remove unused usings

855894e

Copilot AI review requested due to automatic review settings February 24, 2026 01:05

Copilot started reviewing on behalf of adamperlin February 24, 2026 01:06 View session

Copilot AI reviewed Feb 24, 2026

View reviewed changes

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs Outdated Show resolved Hide resolved

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs Show resolved Hide resolved

MichalStrehovsky reviewed Feb 24, 2026

View reviewed changes

adamperlin and others added 2 commits February 25, 2026 11:59

Address review feedback

7478bbf

Update src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWrite…

97c3741

…r.cs Co-authored-by: Copilot <[email protected]>

Copilot AI review requested due to automatic review settings February 25, 2026 22:21

Copilot started reviewing on behalf of adamperlin February 25, 2026 22:22 View session

adamperlin requested a review from MichalStrehovsky February 25, 2026 22:24

Copilot AI reviewed Feb 25, 2026

View reviewed changes

build-analysis bot mentioned this pull request Feb 26, 2026

[FAIL] System.Net.Http.Functional.Tests.SocketsHttpHandler_HttpClientHandlerTest.LargeUriAndHeaders_Works #124487

Open

MichalStrehovsky approved these changes Feb 26, 2026

View reviewed changes

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypeNode.cs Outdated Show resolved Hide resolved

Update src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wa…

6f902e6

…sm/WasmTypeNode.cs Avoids unnecessary copy of `data` when constructing the `ObjectData` in WasmTypeNode.GetData` Co-authored-by: Michal Strehovský <[email protected]>

Copilot AI review requested due to automatic review settings February 26, 2026 19:46

Copilot started reviewing on behalf of adamperlin February 26, 2026 19:47 View session

Copilot AI reviewed Feb 26, 2026

View reviewed changes

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs Show resolved Hide resolved

src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wasm/WasmTypeNode.cs Show resolved Hide resolved

Update src/coreclr/tools/Common/Compiler/DependencyAnalysis/Target_Wa…

4081472

…sm/WasmTypes.cs Co-authored-by: Copilot <[email protected]>

Copilot AI review requested due to automatic review settings February 26, 2026 20:58

Copilot started reviewing on behalf of adamperlin February 26, 2026 20:59 View session

Update src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWrite…

9f2448d

…r.cs Co-authored-by: Copilot <[email protected]>

Copilot AI reviewed Feb 26, 2026

View reviewed changes

src/coreclr/tools/Common/Compiler/ObjectWriter/WasmObjectWriter.cs Show resolved Hide resolved

adamperlin merged commit e99d522 into dotnet:main Feb 27, 2026
123 of 127 checks passed

build-analysis bot mentioned this pull request Feb 27, 2026

"We stopped hearing from agent Azure Pipelines 32. Verify the agent machine is running and has a healthy network connection" dotnet/dnceng#1886

Open

3 tasks

dotnet-maestro bot mentioned this pull request Feb 27, 2026

[main] Source code updates from dotnet/runtime dotnet/dotnet#5129

Merged

Conversation

adamperlin commented Feb 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adamperlin commented Feb 25, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

adamperlin commented Feb 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

adamperlin commented Feb 21, 2026 •

edited

Loading