Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 10 additions & 2 deletions src/coreclr/debug/daccess/dacdbiimpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2315,6 +2315,10 @@ void DacDbiInterfaceImpl::GetClassTypeInfo(TypeHandle typeH
DebuggerIPCE_ExpandedTypeData * pTypeInfo,
AppDomain * pAppDomain)
{
if (typeHandle.AsMethodTable()->IsContinuation())
Comment thread
rcj1 marked this conversation as resolved.
Outdated
Comment thread
rcj1 marked this conversation as resolved.
Outdated
{
typeHandle = TypeHandle(g_pContinuationClassIfSubTypeCreated);
Comment thread
rcj1 marked this conversation as resolved.
Outdated
}
Module * pModule = typeHandle.GetModule();

if (typeHandle.HasInstantiation()) // the type handle represents a generic instantiation
Expand Down Expand Up @@ -2402,9 +2406,13 @@ void DacDbiInterfaceImpl::TypeHandleToBasicTypeInfo(TypeHandle
case ELEMENT_TYPE_CLASS:
case ELEMENT_TYPE_VALUETYPE:
{
Module * pModule = typeHandle.GetModule();
if (typeHandle.AsMethodTable()->IsContinuation())
{
typeHandle = TypeHandle(g_pContinuationClassIfSubTypeCreated);
Comment thread
rcj1 marked this conversation as resolved.
Outdated
}

if (typeHandle.HasInstantiation()) // only set if instantiated
Module * pModule = typeHandle.GetModule();
if (typeHandle.HasInstantiation()) // only set if instantiated
{
pTypeInfo->vmTypeHandle.SetDacTargetPtr(typeHandle.AsTAddr());
}
Expand Down
8 changes: 8 additions & 0 deletions src/coreclr/debug/ee/debugger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11657,6 +11657,10 @@ void Debugger::TypeHandleToBasicTypeInfo(AppDomain *pAppDomain, TypeHandle th, D
case ELEMENT_TYPE_CLASS:
case ELEMENT_TYPE_VALUETYPE:
{
if (th.AsMethodTable()->IsContinuation())
{
th = TypeHandle(g_pContinuationClassIfSubTypeCreated);
Comment thread
rcj1 marked this conversation as resolved.
Outdated
}
res->vmTypeHandle = th.HasInstantiation() ? WrapTypeHandle(th) : VMPTR_TypeHandle::NullPtr();
// only set if instantiated
res->metadataToken = th.GetCl();
Expand Down Expand Up @@ -11739,6 +11743,10 @@ void Debugger::TypeHandleToExpandedTypeInfo(AreValueTypesBoxed boxed,
case ELEMENT_TYPE_CLASS:
{
treatAllValuesAsBoxed:
if (th.AsMethodTable()->IsContinuation())
{
th = TypeHandle(g_pContinuationClassIfSubTypeCreated);
Comment thread
rcj1 marked this conversation as resolved.
Outdated
}
res->ClassTypeData.typeHandle = th.HasInstantiation() ? WrapTypeHandle(th) : VMPTR_TypeHandle::NullPtr(); // only set if instantiated
res->ClassTypeData.metadataToken = th.GetCl();
DebuggerModule * pModule = LookupOrCreateModule(th.GetModule());
Expand Down
Loading