Skip to content

Fix newobj handler for generic constructors #3238

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 1 commit into from
Nov 13, 2025
Merged

Fix newobj handler for generic constructors #3238

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
27 changes: 20 additions & 7 deletions src/CLR/Core/Interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,21 +2464,34 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
}
top->SetObjectReference(nullptr);

// Stack: ... <null> <arg1> <arg2> ... <argN> -> ...
// ^
// Top points here.
// For constructors on generic classes, we need to use the class's generic type
// from the calling context, not the method's generic type.
// The calleeInst.genericType might point to an open generic from the MethodRef,
// but we need the closed generic from the caller's context (stack->m_call.genericType).
const CLR_RT_TypeSpec_Index *genericTypeForContext = nullptr;

// Prefer the caller's generic type if available and valid
if (stack->m_call.genericType != nullptr && NANOCLR_INDEX_IS_VALID(*stack->m_call.genericType))
{
genericTypeForContext = stack->m_call.genericType;
}
// Fallback to the callee's generic type if caller's is not available
else if (calleeInst.genericType != nullptr && NANOCLR_INDEX_IS_VALID(*calleeInst.genericType))
{
genericTypeForContext = calleeInst.genericType;
}

if (calleeInst.genericType == nullptr)
if (genericTypeForContext == nullptr)
{
NANOCLR_CHECK_HRESULT(g_CLR_RT_ExecutionEngine.NewObject(top[0], cls));
}
else
{
CLR_RT_TypeSpec_Instance calleeInstGenericType;
calleeInstGenericType.InitializeFromIndex(*calleeInst.genericType);
CLR_RT_TypeSpec_Instance genericTypeInstance;
genericTypeInstance.InitializeFromIndex(*genericTypeForContext);

NANOCLR_CHECK_HRESULT(
g_CLR_RT_ExecutionEngine.NewObject(top[0], cls, &calleeInstGenericType));
g_CLR_RT_ExecutionEngine.NewObject(top[0], cls, &genericTypeInstance));
}

//
Expand Down