Skip to content

[wasm][R2R] Create manifest token when type reference wasn't pre-registered #131651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavelsavara wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −0
Open

[wasm][R2R] Create manifest token when type reference wasn't pre-registered #131651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ...s/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ModuleTokenResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,19 @@ public ModuleToken GetModuleTokenForType(TypeDesc type, bool allowDynamicallyCre
{
return new ModuleToken(_manifestMutableModule, handle.Value);
}

// The reference wasn't pre-registered while resolving IL tokens. This happens on wasm when the
// method that would have registered it was skipped by the JIT (JitWasmNyiToR2RUnsupported) yet a
// fixup for the type still exists. Dynamically create the manifest reference while new tokens are
// still allowed (this runs before ManifestMetadataTableNode sets DisableNewTokens).
if (!_manifestMutableModule.DisableNewTokens)
{
handle = _manifestMutableModule.TryGetEntityHandle(type);
if (handle.HasValue)
{
return new ModuleToken(_manifestMutableModule, handle.Value);
}
}
}

// Reverse lookup failed
Expand Down
Loading