Skip to content

[wasm] Use lightweight marshal for enums - #118991

Merged
lewing merged 11 commits into
dotnet:mainfrom
maraf:MonoInteropEnum
Sep 3, 2025
Merged

[wasm] Use lightweight marshal for enums#118991
lewing merged 11 commits into
dotnet:mainfrom
maraf:MonoInteropEnum

Conversation

@maraf

@marafmaraf commented Aug 22, 2025•
edited
Loading

Copy link
Copy Markdown
Member

Based on MinimalMarshalingTypeCompatibilityProvider.cs we mark enums as marshallable by lightweight marshaller on build.
We were missing enums when checking for supported types in marshal-ilgen-stub.c on runtime.

Fixes#115780
Contributes to #94187

@marafmaraf added this to the 11.0.0 milestone Aug 22, 2025
@marafmaraf self-assigned this Aug 22, 2025
@marafmaraf added arch-wasm WebAssembly architecture area-Interop-mono labels Aug 22, 2025
@dotnet-policy-service

dotnet-policy-serviceBot commented Aug 22, 2025

Copy link
Copy Markdown
Contributor

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

This was referenced Aug 22, 2025
Closed
Closed
@build-analysisbuild-analysisBot mentioned this pull request Aug 26, 2025
Open
lewing
lewing reviewed Aug 26, 2025
View reviewed changes
Comment threadsrc/mono/mono/component/marshal-ilgen-stub.c Outdated
This was referenced Aug 27, 2025
Open
Open
@build-analysisbuild-analysisBot mentioned this pull request Sep 2, 2025
Closed
@maraf
maraf marked this pull request as ready for review September 2, 2025 12:30
CopilotAI review requested due to automatic review settings September 2, 2025 12:30
CopilotAI reviewed Sep 2, 2025
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR enables lightweight marshalling for enum types in WebAssembly builds. The fix addresses a runtime marshalling issue where enums were not being recognized as supported types by the lightweight marshaller, even though they were marked as marshallable during the build process.

Key changes:

  • Updated runtime marshalling logic to recognize enums as lightweight-marshallable types
  • Added test coverage for enum marshalling through ZipArchive interop functionality

Reviewed Changes

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

FileDescription
src/mono/mono/component/marshal-ilgen-stub.cAdded enum type check to allow lightweight marshalling for enums
src/mono/wasm/testassets/WasmBasicTestApp/App/ZipArchiveInteropTest.csAdded test class that exercises enum marshalling through ZipArchive operations
src/mono/wasm/testassets/WasmBasicTestApp/App/wwwroot/main.jsAdded test case entry point for ZipArchiveInteropTest
src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.csAdded test method to verify ZipArchive enum marshalling functionality

Comment threadsrc/mono/wasm/testassets/WasmBasicTestApp/App/ZipArchiveInteropTest.cs Outdated
@maraf
maraf requested a review from kgSeptember 2, 2025 12:33
@maraf
Update src/mono/wasm/testassets/WasmBasicTestApp/App/ZipArchiveIntero…
1967604
…pTest.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@build-analysisbuild-analysisBot mentioned this pull request Sep 2, 2025
Open
@lewing
lewing enabled auto-merge (squash) September 2, 2025 23:26
lewing
lewing reviewed Sep 2, 2025
View reviewed changes
Comment threadsrc/mono/mono/component/marshal-ilgen-stub.c
@lewing
lewing merged commit 20a932e into dotnet:mainSep 3, 2025
70 checks passed
@maraf

maraf commented Sep 3, 2025

Copy link
Copy Markdown
MemberAuthor

/backport to release/10.0

@github-actions

github-actionsBot commented Sep 3, 2025

Copy link
Copy Markdown
Contributor

Started backporting to release/10.0: https://github.com/dotnet/runtime/actions/runs/17425549273

@maraf
maraf deleted the MonoInteropEnum branch September 3, 2025 06:55
@github-actionsgithub-actionsBot mentioned this pull request Sep 3, 2025
Merged
4 tasks
filipnavara pushed a commit to filipnavara/runtime that referenced this pull request Sep 5, 2025
@maraf@lewing
@filipnavara
[wasm] Use lightweight marshal for enums (dotnet#118991)
452ea84
* Use lightweight marshal for enums
* Wasm build test
* Fix
* Fix test app build
* Fix test app build
* Fix test asserts
* Fix test case
* Build tests are not JS bundler friendly
* Update src/mono/mono/component/marshal-ilgen-stub.c
Co-authored-by: Larry Ewing <lewing@microsoft.com>
* Update src/mono/wasm/testassets/WasmBasicTestApp/App/ZipArchiveInteropTest.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---------
Co-authored-by: Larry Ewing <lewing@microsoft.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Oct 3, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lewinglewinglewing approved these changes
Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@pavelsavarapavelsavarapavelsavara approved these changes
@ilonatommyilonatommyAwaiting requested review from ilonatommyilonatommy is a code owner
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@vitek-karasvitek-karasAwaiting requested review from vitek-karasvitek-karas is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@kgkgAwaiting requested review from kg

Assignees

@marafmaraf

Labels

arch-wasmWebAssembly architecturearea-Interop-mono

Projects

None yet

Milestone

11.0.0

Development

Successfully merging this pull request may close these issues.

Blazor WebAssembly - ZipArchiveEntry.Open causes unexpected termination at runtime in published app on .NET 10 Preview 3 and 4

4 participants

@maraf@lewing@pavelsavara