Skip to content

Update assert to handle object[] element type #105287

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 2 commits into from
Jul 23, 2024
Merged

Update assert to handle object[] element type #105287

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1da0b
Update assert.
AaronRobinsonMSFT Jul 22, 2024
5a32387
Update src/coreclr/vm/comutilnative.cpp
AaronRobinsonMSFT Jul 23, 2024
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
5 changes: 3 additions & 2 deletions src/coreclr/vm/comutilnative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,10 @@ extern "C" void QCALLTYPE ExceptionNative_GetMethodFromStackTrace(QCall::ObjectH
// The stacktrace can be either sbyte[] or Object[]. In the latter case,
// the first entry is the actual stack trace sbyte[], the rest are pointers
// to the method info objects. We only care about the first entry here.
if (arrayBaseRef->GetArrayElementType() != ELEMENT_TYPE_I1)
CorElementType elemType = arrayBaseRef->GetArrayElementType();
if (elemType != ELEMENT_TYPE_I1)
{
_ASSERTE(arrayBaseRef->GetArrayElementType() == ELEMENT_TYPE_OBJECT);
_ASSERTE(elemType == ELEMENT_TYPE_OBJECT || elemType == ELEMENT_TYPE_CLASS);
PTRARRAYREF ptrArrayRef = (PTRARRAYREF)arrayBaseRef;
arrayBaseRef = (ARRAYBASEREF)OBJECTREFToObject(ptrArrayRef->GetAt(0));
}
Expand Down