Skip to content

[WIP] conditionally assign (exact)contextHandle #45321

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

Closed
wants to merge 2 commits into from
Closed

[WIP] conditionally assign (exact)contextHandle #45321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b306c03
conditionally assign (exact)contextHandle
Rattenkrieg Nov 29, 2020
a471905
assign updated context when exactContextHandle pointing to nullptr
Rattenkrieg Nov 30, 2020
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
41 changes: 36 additions & 5 deletions src/coreclr/src/jit/importer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21193,14 +21193,45 @@ void Compiler::impDevirtualizeCall(GenTreeCall* call,
// https://github.com/dotnet/runtime/issues/38477
// but hopefully the derived method conforms to
// the base in most other ways.
*method = derivedMethod;
*methodFlags = derivedMethodAttribs;
*contextHandle = MAKE_METHODCONTEXT(derivedMethod);
*method = derivedMethod;
*methodFlags = derivedMethodAttribs;

if (((SIZE_T)(*contextHandle) & CORINFO_CONTEXTFLAGS_MASK) == CORINFO_CONTEXTFLAGS_METHOD)
{
*contextHandle = MAKE_METHODCONTEXT(derivedMethod);
}
else
{
assert(((SIZE_T)(*contextHandle) & CORINFO_CONTEXTFLAGS_MASK) == CORINFO_CONTEXTFLAGS_CLASS);
if (isExact)
{
*contextHandle = MAKE_CLASSCONTEXT(objClass);
}
else
{
*contextHandle = MAKE_CLASSCONTEXT(derivedClass);
}
}

// Update context handle.
if ((exactContextHandle != nullptr) && (*exactContextHandle != nullptr))
if ((exactContextHandle != nullptr))
{
*exactContextHandle = MAKE_METHODCONTEXT(derivedMethod);
Copy link
Contributor Author

@Rattenkrieg Rattenkrieg Nov 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why it didn't work that way:

info.compCompHnd->getClassName(objClass):	  "G`1[[System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]"
info.compCompHnd->getClassName(baseClass):	  "G`1[__Canon]"
info.compCompHnd->getClassName(derivedClass): "G`1[__Canon]"

if (((SIZE_T)(*exactContextHandle) & CORINFO_CONTEXTFLAGS_MASK) == CORINFO_CONTEXTFLAGS_METHOD)
{
*exactContextHandle = MAKE_METHODCONTEXT(derivedMethod);
}
else
{
assert(((SIZE_T)(*exactContextHandle) & CORINFO_CONTEXTFLAGS_MASK) == CORINFO_CONTEXTFLAGS_CLASS);
if (isExact)
{
*exactContextHandle = MAKE_CLASSCONTEXT(objClass);
}
else
{
*exactContextHandle = MAKE_CLASSCONTEXT(derivedClass);
}
}
}

#ifdef FEATURE_READYTORUN_COMPILER
Expand Down