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

Changes from 2 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
13 changes: 5 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,14 @@ 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);
uint32_t rank = m_compHnd->getArrayRank(arrayClsHnd);

AddIns(INTOP_NEWMDARR);
m_pLastNewIns->data[0] = GetDataItemIndex(ctorClass);
m_pLastNewIns->data[1] = numArgs;
m_pLastNewIns->data[0] = GetDataItemIndex(arrayClsHnd);
m_pLastNewIns->data[1] = rank;
Copy link
Member

Choose a reason for hiding this comment

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

This should not be rank. This should be the actual number of the arguments in the signature, so that the code handles different overloads of array constructor correctly. The earlier code looks correct, the new code looks wrong. I think this part of the change should be reverted.

Copy link
Member

Choose a reason for hiding this comment

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

Also, you can rename the argument name on the executor side to numArgs to avoid confusion

runtime/src/coreclr/vm/interpexec.cpp

Line 135 in ca63ce6

static OBJECTREF CreateMultiDimArray(MethodTable* arrayClass, int8_t* stack, int32_t dimsOffset, int rank)

Copy link
Member Author

Choose a reason for hiding this comment

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

This should be the actual number of the arguments in the signature, so that the code handles different overloads of array constructor correctly.

Sorry I overlooked this even though you mentioned it. I was focused on #116493 and I think the error was not properly guarding the INTOP_NEWMDARR case, which caused other instance methods to take the same path.

}
else
{
Expand Down
Loading