Skip to content

Fix comments in asm with JitDiffableDasm=1 #56416

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
4 commits merged into from
Jul 28, 2021
Merged

Fix comments in asm with JitDiffableDasm=1 #56416

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c837418
Avoid asserts in DasmDiffable mode
EgorBo Jul 27, 2021
258944f
simplify
EgorBo Jul 27, 2021
1760b3e
Make formatter happier
EgorBo Jul 27, 2021
aa48101
Address feedback
EgorBo Jul 27, 2021
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
14 changes: 9 additions & 5 deletions src/coreclr/jit/emit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3932,11 +3932,11 @@ void emitter::emitDispCommentForHandle(size_t handle, GenTreeFlags flag)

if (flag == GTF_ICON_STR_HDL)
{
const WCHAR* wstr = emitComp->eeGetCPString(handle);
const WCHAR* wstr = emitComp->opts.disDiffable ? nullptr : emitComp->eeGetCPString(handle);
// NOTE: eGetCPString always returns nullptr on Linux/ARM
if (wstr == nullptr)
{
printf("%s string handle", commentPrefix);
str = "string handle";
}
else
{
Expand Down Expand Up @@ -3967,7 +3967,8 @@ void emitter::emitDispCommentForHandle(size_t handle, GenTreeFlags flag)
}
else if (flag == GTF_ICON_CLASS_HDL)
{
str = emitComp->eeGetClassName(reinterpret_cast<CORINFO_CLASS_HANDLE>(handle));
str = emitComp->opts.disDiffable ? "class handle"
: emitComp->eeGetClassName(reinterpret_cast<CORINFO_CLASS_HANDLE>(handle));
}
#ifndef TARGET_XARCH
// These are less useful for xarch:
Expand All @@ -3981,15 +3982,18 @@ void emitter::emitDispCommentForHandle(size_t handle, GenTreeFlags flag)
}
else if (flag == GTF_ICON_FIELD_HDL)
{
str = emitComp->eeGetFieldName(reinterpret_cast<CORINFO_FIELD_HANDLE>(handle));
str = emitComp->opts.disDiffable ? "field handle"
: emitComp->eeGetFieldName(reinterpret_cast<CORINFO_FIELD_HANDLE>(handle));
}
else if (flag == GTF_ICON_STATIC_HDL)
{
str = "static handle";
}
else if (flag == GTF_ICON_METHOD_HDL)
{
str = emitComp->eeGetMethodFullName(reinterpret_cast<CORINFO_METHOD_HANDLE>(handle));
str = emitComp->opts.disDiffable
? "method handle"
: emitComp->eeGetMethodFullName(reinterpret_cast<CORINFO_METHOD_HANDLE>(handle));
}
else if (flag == GTF_ICON_FTN_ADDR)
{
Expand Down