Skip to content
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

GetTypeFields should return ELEMENT_TYPE_BYREF. #65880

Merged
merged 3 commits into from
Feb 26, 2022
Merged

GetTypeFields should return ELEMENT_TYPE_BYREF. #65880

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b749a41
GetTypeField should return ELEMENT_TYPE_BYREF.
AaronRobinsonMSFT Feb 25, 2022
ccf0cae
Add details for byref COR_FIELD.
AaronRobinsonMSFT Feb 25, 2022
12fed4d
Remove setting of token2 in all cases. This value is not used in any
AaronRobinsonMSFT Feb 25, 2022
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
47 changes: 30 additions & 17 deletions src/coreclr/debug/daccess/dacdbiimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5416,11 +5416,11 @@ GENERICS_TYPE_TOKEN DacDbiInterfaceImpl::ResolveExactGenericArgsToken(DWORD

if (dwExactGenericArgsTokenIndex == 0)
{
// In a rare case of VS4Mac debugging VS4Mac ARM64 optimized code we get a null generics argument token. We aren't sure
// why the token is null, it may be a bug or it may be by design in the runtime. In the interest of time we are working
// around the issue rather than investigating the root cause. This workaround should only cause us to degrade generic
// types from exact type parameters to approximate or canonical type parameters. In the future if we discover this issue
// is happening more frequently than we expect or the workaround is more impactful than we expect we may need to remove
// In a rare case of VS4Mac debugging VS4Mac ARM64 optimized code we get a null generics argument token. We aren't sure
// why the token is null, it may be a bug or it may be by design in the runtime. In the interest of time we are working
// around the issue rather than investigating the root cause. This workaround should only cause us to degrade generic
// types from exact type parameters to approximate or canonical type parameters. In the future if we discover this issue
// is happening more frequently than we expect or the workaround is more impactful than we expect we may need to remove
// this workaround and resolve the underlying issue.
if (rawToken == 0)
{
Expand Down Expand Up @@ -6388,7 +6388,7 @@ HRESULT DacHeapWalker::MoveToNextObject()
mCurrObj += mCurrSize;

// Check to see if we are in the correct bounds.
bool isGen0 = IsRegionGCEnabled() ? (mHeaps[mCurrHeap].Segments[mCurrSeg].Generation == 0) :
bool isGen0 = IsRegionGCEnabled() ? (mHeaps[mCurrHeap].Segments[mCurrSeg].Generation == 0) :
(mHeaps[mCurrHeap].Gen0Start <= mCurrObj && mHeaps[mCurrHeap].Gen0End > mCurrObj);

if (isGen0)
Expand Down Expand Up @@ -6480,7 +6480,7 @@ HRESULT DacHeapWalker::NextSegment()

mCurrObj = mHeaps[mCurrHeap].Segments[mCurrSeg].Start;

bool isGen0 = IsRegionGCEnabled() ? (mHeaps[mCurrHeap].Segments[mCurrSeg].Generation == 0) :
bool isGen0 = IsRegionGCEnabled() ? (mHeaps[mCurrHeap].Segments[mCurrSeg].Generation == 0) :
(mHeaps[mCurrHeap].Gen0Start <= mCurrObj && mHeaps[mCurrHeap].Gen0End > mCurrObj);

if (isGen0)
Expand Down Expand Up @@ -6904,7 +6904,7 @@ HRESULT DacDbiInterfaceImpl::GetHeapSegments(OUT DacDbiArrayList<COR_SEGMENT> *p
_ASSERTE(eph < heaps[i].SegmentCount);
if (heaps[i].Segments[eph].Start != heaps[i].Gen1Start)
total++;
}
}
}

pSegments->Alloc(total);
Expand Down Expand Up @@ -7166,32 +7166,45 @@ HRESULT DacDbiInterfaceImpl::GetObjectFields(COR_TYPEID id, ULONG32 celt, COR_FI
for (ULONG32 i = 0; i < cFields; ++i)
{
FieldDesc *pField = fieldDescIterator.Next();
layout[i].token = pField->GetMemberDef();
layout[i].offset = (ULONG32)pField->GetOffset() + (fReferenceType ? Object::GetOffsetOfFirstField() : 0);

COR_FIELD* corField = layout + i;
corField->token = pField->GetMemberDef();
corField->offset = (ULONG32)pField->GetOffset() + (fReferenceType ? Object::GetOffsetOfFirstField() : 0);

TypeHandle fieldHandle = pField->LookupFieldTypeHandle();

if (fieldHandle.IsNull())
{
layout[i].id.token1 = 0;
layout[i].id.token2 = 0;
layout[i].fieldType = (CorElementType)0;
corField->id = {};
corField->fieldType = (CorElementType)0;
}
else if (fieldHandle.IsByRef())
{
TypeHandle tgtType = fieldHandle.GetTypeParam();
corField->id.token1 = CoreLibBinder::GetElementType(ELEMENT_TYPE_I).GetAddr();
if (!tgtType.IsNull())
{
PTR_MethodTable cmt = tgtType.GetMethodTable();
corField->id.token2 = (ULONG64)cmt.GetAddr();
AaronRobinsonMSFT marked this conversation as resolved.
Show resolved Hide resolved
}

corField->fieldType = ELEMENT_TYPE_BYREF;
}
else
{
PTR_MethodTable mt = fieldHandle.GetMethodTable();
layout[i].fieldType = mt->GetInternalCorElementType();
layout[i].id.token1 = (ULONG64)mt.GetAddr();
corField->fieldType = mt->GetInternalCorElementType();
corField->id.token1 = (ULONG64)mt.GetAddr();

if (!mt->IsArray())
{
layout[i].id.token2 = 0;
corField->id.token2 = 0;
}
else
{
TypeHandle hnd = mt->GetArrayElementTypeHandle();
PTR_MethodTable cmt = hnd.GetMethodTable();
layout[i].id.token2 = (ULONG64)cmt.GetAddr();
corField->id.token2 = (ULONG64)cmt.GetAddr();
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/debug/ee/debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12056,11 +12056,11 @@ TypeHandle Debugger::TypeDataWalk::ReadTypeHandle()
case ELEMENT_TYPE_ARRAY:
case ELEMENT_TYPE_SZARRAY:
th = g_pEEInterface->LoadArrayType(data->data.elementType, typar, data->data.ArrayTypeData.arrayRank);
break;
case ELEMENT_TYPE_PTR:
case ELEMENT_TYPE_BYREF:
break;
case ELEMENT_TYPE_PTR:
case ELEMENT_TYPE_BYREF:
th = g_pEEInterface->LoadPointerOrByrefType(data->data.elementType, typar);
break;
break;
default:
_ASSERTE(0);
}
Expand Down