Skip to content

Change InitClass and InitInstantiatedClass to return void* for WASM portable entry point compatibility #131119

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

Merged
davidwrighton merged 1 commit into from
Jul 21, 2026
Merged

Change InitClass and InitInstantiatedClass to return void* for WASM portable entry point compatibility #131119

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
21 changes: 13 additions & 8 deletions src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/InitHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@ internal static void InitClassSlow(MethodTable* mt)
}

[DebuggerHidden]
private static void InitClass(MethodTable* mt)
private static void* InitClass(MethodTable* mt)
{
if (mt->AuxiliaryData->IsClassInited)
return;
else
if (!mt->AuxiliaryData->IsClassInited)
InitClassSlow(mt);

// The InitClass JIT helper is modeled as value-returning by the JIT and interpreter
// (the result is pushed and then discarded). On targets that use portable entry points
// (wasm), the call_indirect signature must match the compiled method exactly, including
// return arity, so this helper returns a (dummy) value rather than void.
return null;
}

[DebuggerHidden]
private static void InitInstantiatedClass(MethodTable* mt, MethodDesc* methodDesc)
private static void* InitInstantiatedClass(MethodTable* mt, MethodDesc* methodDesc)
{
MethodTable *pTemplateMT = methodDesc->MethodTable;
MethodTable *pMT;
Expand All @@ -45,10 +49,11 @@ private static void InitInstantiatedClass(MethodTable* mt, MethodDesc* methodDes
pMT = pTemplateMT;
}

if (pMT->AuxiliaryData->IsClassInitedAndActive)
return;
else
if (!pMT->AuxiliaryData->IsClassInitedAndActive)
InitClassSlow(pMT);

// See the comment in InitClass for why this helper returns a value rather than void.
return null;
}

[DebuggerHidden]
Expand Down
Loading