Skip to content

Fix unboxing stubs on wasm #120153

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
merged 13 commits into from
Sep 28, 2025
Merged

Fix unboxing stubs on wasm #120153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b5e6231
Fix unboxing stubs on wasm
radekdoulik Sep 26, 2025
88777fa
Apply suggestions from code review
radekdoulik Sep 26, 2025
70cc75d
Feedback
radekdoulik Sep 26, 2025
87fe2ec
Feedback
radekdoulik Sep 26, 2025
4c0b8aa
Do not double free
radekdoulik Sep 26, 2025
160dca1
Add thunk for the IL stub
radekdoulik Sep 26, 2025
17770d5
Update src/coreclr/vm/wasm/helpers.cpp
radekdoulik Sep 26, 2025
48c6e7f
Update src/coreclr/vm/prestub.cpp
radekdoulik Sep 26, 2025
952c185
Finish the feedback
radekdoulik Sep 26, 2025
5b7f342
Feedback
radekdoulik Sep 26, 2025
f5483a5
Feedback
radekdoulik Sep 26, 2025
7012a06
Feedback
radekdoulik Sep 26, 2025
5e8de55
Feedback
radekdoulik Sep 26, 2025
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
8 changes: 0 additions & 8 deletions src/coreclr/clrdefinitions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ if(CLR_CMAKE_TARGET_WIN32 AND CLR_CMAKE_TARGET_ARCH_AMD64)
add_compile_definitions(OUT_OF_PROCESS_SETTHREADCONTEXT)
endif(CLR_CMAKE_TARGET_WIN32 AND CLR_CMAKE_TARGET_ARCH_AMD64)

if(NOT CLR_CMAKE_TARGET_ARCH_I386)
add_definitions(-DFEATURE_PORTABLE_SHUFFLE_THUNKS)
endif()

if(CLR_CMAKE_TARGET_UNIX OR NOT CLR_CMAKE_TARGET_ARCH_I386)
add_definitions(-DFEATURE_INSTANTIATINGSTUB_AS_IL)
endif()

add_compile_definitions(FEATURE_CODE_VERSIONING)
add_definitions(-DFEATURE_COLLECTIBLE_TYPES)

Expand Down
8 changes: 8 additions & 0 deletions src/coreclr/inc/switches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,14 @@
#define CHAIN_LOOKUP
#endif // FEATURE_VIRTUAL_STUB_DISPATCH

#if !defined(FEATURE_PORTABLE_ENTRYPOINTS) && !defined(TARGET_X86)
#define FEATURE_PORTABLE_SHUFFLE_THUNKS
#endif

#if defined(TARGET_UNIX) || !defined(TARGET_X86)
#define FEATURE_INSTANTIATINGSTUB_AS_IL
#endif

// If this is uncommented, leaves a file "StubLog_<pid>.log" with statistics on the behavior
// of stub-based interface dispatch.
//#define STUB_LOGGING
Expand Down
8 changes: 6 additions & 2 deletions src/coreclr/vm/comdelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ BOOL GenerateShuffleArrayPortable(MethodDesc* pMethodSrc, MethodDesc *pMethodDst
}
#endif // FEATURE_PORTABLE_SHUFFLE_THUNKS

#ifndef FEATURE_PORTABLE_ENTRYPOINTS
BOOL GenerateShuffleArray(MethodDesc* pInvoke, MethodDesc *pTargetMeth, SArray<ShuffleEntry> * pShuffleEntryArray)
{
STANDARD_VM_CONTRACT;
Expand Down Expand Up @@ -773,8 +774,8 @@ BOOL GenerateShuffleArray(MethodDesc* pInvoke, MethodDesc *pTargetMeth, SArray<S
}
return TRUE;
}

static ShuffleThunkCache* s_pShuffleThunkCache = NULL;
#endif // !FEATURE_PORTABLE_ENTRYPOINTS

// One time init.
void COMDelegate::Init()
Expand All @@ -786,8 +787,9 @@ void COMDelegate::Init()
MODE_ANY;
}
CONTRACTL_END;

#ifndef FEATURE_PORTABLE_ENTRYPOINTS
s_pShuffleThunkCache = new ShuffleThunkCache(SystemDomain::GetGlobalLoaderAllocator()->GetStubHeap());
#endif
}

#ifdef FEATURE_COMINTEROP
Expand Down Expand Up @@ -913,6 +915,7 @@ static PCODE SetupShuffleThunk(MethodTable * pDelMT, MethodDesc *pTargetMeth)

MethodDesc *pMD = pClass->GetInvokeMethod();

#ifndef FEATURE_PORTABLE_ENTRYPOINTS
// We haven't already setup a shuffle thunk, go do it now (which will cache the result automatically).
StackSArray<ShuffleEntry> rShuffleEntryArray;
if (GenerateShuffleArray(pMD, pTargetMeth, &rShuffleEntryArray))
Expand All @@ -928,6 +931,7 @@ static PCODE SetupShuffleThunk(MethodTable * pDelMT, MethodDesc *pTargetMeth)
pShuffleThunk = pShuffleThunkCache->Canonicalize((const BYTE *)&rShuffleEntryArray[0], "DelegateShuffleThunk");
}
else
#endif // !FEATURE_PORTABLE_ENTRYPOINTS
{
#if defined(TARGET_RISCV64) || defined(TARGET_LOONGARCH64)
pShuffleThunk = CreateILDelegateShuffleThunk(pMD, isInstRetBuff);
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/vm/comdelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ struct ShuffleEntry

#include <poppack.h>

#ifndef FEATURE_PORTABLE_ENTRYPOINTS
class ShuffleThunkCache : public StubCacheBase
{
public:
Expand Down Expand Up @@ -204,5 +205,6 @@ class ShuffleThunkCache : public StubCacheBase
return sizeof(ShuffleEntry) * (UINT)(1 + (pse - (ShuffleEntry*)pRawStub));
}
};
#endif // !FEATURE_PORTABLE_ENTRYPOINTS

#endif // _COMDELEGATE_H_
4 changes: 4 additions & 0 deletions src/coreclr/vm/loaderallocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1767,6 +1767,7 @@ void AssemblyLoaderAllocator::Init()
m_dependentHandleToNativeObjectSetCrst.Init(CrstLeafLock, CRST_UNSAFE_ANYMODE);

LoaderAllocator::Init(NULL /*pExecutableHeapMemory*/);
#ifndef FEATURE_PORTABLE_ENTRYPOINTS
if (IsCollectible())
{
// TODO: the ShuffleThunkCache should really be using the m_pStubHeap, however the unloadability support
Expand All @@ -1775,6 +1776,7 @@ void AssemblyLoaderAllocator::Init()
// https://github.com/dotnet/runtime/issues/55697 tracks this issue.
m_pShuffleThunkCache = new ShuffleThunkCache(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}
#endif // !FEATURE_PORTABLE_ENTRYPOINTS
}


Expand All @@ -1786,8 +1788,10 @@ AssemblyLoaderAllocator::~AssemblyLoaderAllocator()
m_binderToRelease = NULL;
}

#ifndef FEATURE_PORTABLE_ENTRYPOINTS
delete m_pShuffleThunkCache;
m_pShuffleThunkCache = NULL;
#endif // !FEATURE_PORTABLE_ENTRYPOINTS
}

void AssemblyLoaderAllocator::RegisterBinder(CustomAssemblyBinder* binderToRelease)
Expand Down
36 changes: 26 additions & 10 deletions src/coreclr/vm/prestub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ void MethodDesc::CreateDerivedTargetSigWithExtraParams(MetaSig& msig, SigBuilder

#ifdef FEATURE_INSTANTIATINGSTUB_AS_IL

Stub * CreateUnboxingILStubForSharedGenericValueTypeMethods(MethodDesc* pTargetMD)
Stub * CreateUnboxingILStubForValueTypeMethods(MethodDesc* pTargetMD)
{

CONTRACT(Stub*)
Expand Down Expand Up @@ -1510,13 +1510,16 @@ Stub * CreateUnboxingILStubForSharedGenericValueTypeMethods(MethodDesc* pTargetM
}
#endif

// Push the hidden context param
// The context is going to be captured from the thisptr
pCode->EmitLoadThis();
pCode->EmitLDFLDA(tokRawData);
pCode->EmitLDC(Object::GetOffsetOfFirstField());
pCode->EmitSUB();
pCode->EmitLDIND_I();
if (pTargetMD->RequiresInstMethodTableArg())
{
// Push the hidden context param
// The context is going to be captured from the thisptr
pCode->EmitLoadThis();
pCode->EmitLDFLDA(tokRawData);
pCode->EmitLDC(Object::GetOffsetOfFirstField());
pCode->EmitSUB();
pCode->EmitLDIND_I();
}

#ifndef TARGET_X86
if (msig.HasAsyncContinuation())
Expand Down Expand Up @@ -1727,13 +1730,16 @@ Stub * MakeUnboxingStubWorker(MethodDesc *pMD)
else
#endif
{
#ifdef FEATURE_PORTABLE_ENTRYPOINTS
pstub = CreateUnboxingILStubForValueTypeMethods(pUnboxedMD);
#else // !FEATURE_PORTABLE_ENTRYPOINTS
#ifdef FEATURE_INSTANTIATINGSTUB_AS_IL
#ifndef FEATURE_PORTABLE_SHUFFLE_THUNKS
if (pUnboxedMD->RequiresInstMethodTableArg())
#endif // !FEATURE_PORTABLE_SHUFFLE_THUNKS
{
_ASSERTE(pUnboxedMD->RequiresInstMethodTableArg());
pstub = CreateUnboxingILStubForSharedGenericValueTypeMethods(pUnboxedMD);
pstub = CreateUnboxingILStubForValueTypeMethods(pUnboxedMD);
}
#ifndef FEATURE_PORTABLE_SHUFFLE_THUNKS
else
Expand All @@ -1746,6 +1752,7 @@ Stub * MakeUnboxingStubWorker(MethodDesc *pMD)
pstub = sl.Link(pMD->GetLoaderAllocator()->GetStubHeap(), NEWSTUB_FL_NONE, "UnboxingStub");
}
#endif // !FEATURE_PORTABLE_SHUFFLE_THUNKS
#endif // FEATURE_PORTABLE_ENTRYPOINTS
}
RETURN pstub;
}
Expand Down Expand Up @@ -2377,6 +2384,15 @@ PCODE MethodDesc::DoPrestub(MethodTable *pDispatchingMT, CallerGCMode callerGCMo
}
else
{
#ifdef FEATURE_PORTABLE_ENTRYPOINTS
pCode = pStub->GetEntryPoint();
pStub->DecRef();

void* ilStubInterpData = PortableEntryPoint::GetInterpreterData(pCode);
_ASSERTE(ilStubInterpData != NULL);
SetInterpreterCode((InterpByteCodeStart*)ilStubInterpData);
SetCodeEntryPoint(pCode);
#else
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
#else
#else // FEATURE_PORTABLE_ENTRYPOINTS

if (!GetOrCreatePrecode()->SetTargetInterlocked(pStub->GetEntryPoint()))
{
if (pStub->HasExternalEntryPoint())
Expand All @@ -2396,12 +2412,12 @@ PCODE MethodDesc::DoPrestub(MethodTable *pDispatchingMT, CallerGCMode callerGCMo
// need to free the Stub allocation now.
pStub->DecRef();
}
#endif // !FEATURE_PORTABLE_ENTRYPOINTS
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
#endif // !FEATURE_PORTABLE_ENTRYPOINTS
#endif // FEATURE_PORTABLE_ENTRYPOINTS

}

_ASSERTE(!IsPointingToPrestub());
_ASSERTE(HasStableEntryPoint());


pCode = DoBackpatch(pMT, pDispatchingMT, FALSE);

Return:
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/vm/wasm/cgencpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ class StubLinkerCPU : public StubLinker
{
public:
static void Init() { /* no-op on wasm */ }
inline void EmitShuffleThunk(struct ShuffleEntry *pShuffleEntryArray) {
_ASSERTE("The EmitShuffleThunk is not implemented on wasm");
}
inline VOID EmitComputedInstantiatingMethodStub(MethodDesc* pSharedMD, struct ShuffleEntry *pShuffleEntryArray, void* extraArg) {
_ASSERTE("The EmitComputedInstantiatingMethodStub is not implemented on wasm");
}
};

//**********************************************************************
Expand Down
16 changes: 16 additions & 0 deletions src/coreclr/vm/wasm/helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,12 @@ namespace
*(int32_t*)pRet = (*fptr)(ARG_IND(0), ARG(1));
}

void CallFunc_I32_I32IND_I32_I32IND_I32_RetI32(PCODE pcode, int8_t *pArgs, int8_t *pRet)
{
int32_t (*fptr)(int32_t, int32_t, int32_t, int32_t, int32_t) = (int32_t (*)(int32_t, int32_t, int32_t, int32_t, int32_t))pcode;
*(int32_t*)pRet = (*fptr)(ARG(0), ARG_IND(1), ARG(2), ARG_IND(3), ARG(4));
}

void CallFunc_I32IND_I32_I32_I32_I32_I32_RetI32(PCODE pcode, int8_t *pArgs, int8_t *pRet)
{
int32_t (*fptr)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t) = (int32_t (*)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t))pcode;
Expand Down Expand Up @@ -690,6 +696,16 @@ namespace
return (void*)&CallFunc_I32IND_I32_RetI32;
}
break;
case 5:
if (args[0] == ConvertType::ToI32 &&
args[1] == ConvertType::ToI32Indirect &&
args[2] == ConvertType::ToI32 &&
args[3] == ConvertType::ToI32Indirect &&
args[4] == ConvertType::ToI32)
{
return (void*)&CallFunc_I32_I32IND_I32_I32IND_I32_RetI32;
}
break;
case 6:
if (args[0] == ConvertType::ToI32Indirect &&
args[1] == ConvertType::ToI32 &&
Expand Down
Loading