Skip to content

[clr-interp] Emit INTOP_NEWMDARR only for array ctor #116544

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 7 commits into from
Jun 13, 2025
+10 −16
Merged

[clr-interp] Emit INTOP_NEWMDARR only for array ctor #116544

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d059290
Emit INTOP_NEWMDARR only for array ctor and use rank as dimension count
kotlarmilos Jun 11, 2025
6d38dee
Fix condition for INTOP_NEWMDARR
kotlarmilos Jun 11, 2025
93ea23c
Update INTOP_NEWMDARR to use numArgs for dimension count
kotlarmilos Jun 12, 2025
ffc84f7
Remove rank
kotlarmilos Jun 12, 2025
d1b7bce
Update src/coreclr/interpreter/compiler.cpp
kotlarmilos Jun 12, 2025
d23616b
Update src/coreclr/interpreter/compiler.cpp
kotlarmilos Jun 12, 2025
a05ebee
Merge branch 'main' into improvement/coreclr-interp-md-array-checks
kotlarmilos Jun 13, 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
12 changes: 4 additions & 8 deletions src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2506,17 +2506,13 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* constrainedClass, bool rea
}
m_pLastNewIns->data[0] = GetDataItemIndex(callInfo.hMethod);
}
else if ((callInfo.classFlags & CORINFO_FLG_ARRAY) && !readonly)
else if ((callInfo.classFlags & CORINFO_FLG_ARRAY) && newObj)
{
CORINFO_SIG_INFO ctorSignature;
CORINFO_CLASS_HANDLE ctorClass;

m_compHnd->getMethodSig(resolvedCallToken.hMethod, &ctorSignature);
ctorClass = m_compHnd->getMethodClass(resolvedCallToken.hMethod);
CORINFO_CLASS_HANDLE arrayClsHnd = m_compHnd->getMethodClass(resolvedCallToken.hMethod);

AddIns(INTOP_NEWMDARR);
m_pLastNewIns->data[0] = GetDataItemIndex(ctorClass);
m_pLastNewIns->data[1] = numArgs;
m_pLastNewIns->data[0] = GetDataItemIndex(arrayClsHnd);
m_pLastNewIns->data[1] = callInfo.sig.numArgs;
}
else
{
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ static void InterpBreakpoint()
}
#endif

static OBJECTREF CreateMultiDimArray(MethodTable* arrayClass, int8_t* stack, int32_t dimsOffset, int rank)
static OBJECTREF CreateMultiDimArray(MethodTable* arrayClass, int8_t* stack, int32_t dimsOffset, int numArgs)
{
int32_t* dims = (int32_t*)alloca(rank * sizeof(int32_t));
for (int i = 0; i < rank; i++)
int32_t* dims = (int32_t*)alloca(numArgs * sizeof(int32_t));
for (int i = 0; i < numArgs; i++)
{
dims[i] = *(int32_t*)(stack + dimsOffset + i * 8);
}

return AllocateArrayEx(arrayClass, dims, rank);
return AllocateArrayEx(arrayClass, dims, numArgs);
}

#define LOCAL_VAR_ADDR(offset,type) ((type*)(stack + (offset)))
Expand Down