Skip to content

DML formats array missing DML_Async entry #3140

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
AaronRobinsonMSFT merged 1 commit into from
Jun 22, 2022
Merged

DML formats array missing DML_Async entry #3140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 1 deletion src/SOS/Strike/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4333,7 +4333,7 @@ void GetAllocContextPtrs(AllocInfo *pallocInfo)
CLRDATA_ADDRESS allocLimit;

ReleaseHolder<ISOSDacInterface12> sos12;
if (SUCCEEDED(g_sos->QueryInterface(__uuidof(ISOSDacInterface12), &sos12)) &&
if (SUCCEEDED(g_sos->QueryInterface(__uuidof(ISOSDacInterface12), &sos12)) &&
SUCCEEDED(sos12->GetGlobalAllocationContext(&allocPtr, &allocLimit)) &&
allocPtr != 0)
{
Expand Down Expand Up @@ -4822,12 +4822,15 @@ const char * const DMLFormats[] =
"<exec cmd=\"!DumpRCW /d %s\">%s</exec>", // DML_RCWrapper
"<exec cmd=\"!DumpCCW /d %s\">%s</exec>", // DML_CCWrapper
"<exec cmd=\"!ClrStack -i %S %d\">%S</exec>", // DML_ManagedVar
"<exec cmd=\"!DumpObj /d %s\">%s</exec>", // DML_Async
"<exec cmd=\"!DumpIL /i %s\">%s</exec>", // DML_IL
"<exec cmd=\"!DumpRCW -cw /d %s\">%s</exec>", // DML_ComWrapperRCW
"<exec cmd=\"!DumpCCW -cw /d %s\">%s</exec>", // DML_ComWrapperCCW
"<exec cmd=\"dps %s L%d\">%s</exec>", // DML_TaggedMemory
};

static_assert(ARRAY_SIZE(DMLFormats) == Output::DML_Last, "Output types and formats must match in length");

void ConvertToLower(__out_ecount(len) char *buffer, size_t len)
{
for (size_t i = 0; i < len && buffer[i]; ++i)
Expand Down
4 changes: 3 additions & 1 deletion src/SOS/Strike/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,9 @@ namespace Output
DML_IL,
DML_ComWrapperRCW,
DML_ComWrapperCCW,
DML_TaggedMemory
DML_TaggedMemory,

DML_Last
};

/**********************************************************************\
Expand Down