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

Improve updating classes for generics #88277

Closed
wants to merge 2 commits into from
Closed

Improve updating classes for generics #88277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb3824
Improve updating classes for generics
MichalPetryka Jun 30, 2023
7faccd1
Merge branch 'dotnet:main' into better-generic
MichalPetryka Jul 18, 2023
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
26 changes: 12 additions & 14 deletions src/coreclr/jit/lclvars.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3169,37 +3169,35 @@ void Compiler::lvaUpdateClass(unsigned varNum, CORINFO_CLASS_HANDLE clsHnd, bool
assert(varDsc->lvSingleDef);

// Now see if we should update.
//

// New information may not always be "better" so do some
// simple analysis to decide if the update is worthwhile.
const bool isNewClass = (clsHnd != varDsc->lvClassHnd);
bool shouldUpdate = false;

// Are we attempting to update the class? Only check this when we have
// an new type and the existing class is inexact... we should not be
// updating exact classes.
if (!varDsc->lvClassIsExact && isNewClass)
// Are we attempting to update exactness?
if (isExact && !varDsc->lvClassIsExact)
{
shouldUpdate = !!info.compCompHnd->isMoreSpecificType(varDsc->lvClassHnd, clsHnd);
shouldUpdate = true;
}
// Else are we attempting to update exactness?
else if (isExact && !varDsc->lvClassIsExact && !isNewClass)
// Are we attempting to update the class?
else if (isNewClass)
{
shouldUpdate = true;
shouldUpdate = !!info.compCompHnd->isMoreSpecificType(varDsc->lvClassHnd, clsHnd);
}

#if DEBUG
if (isNewClass || (isExact != varDsc->lvClassIsExact))
if (shouldUpdate)
{
#if DEBUG
JITDUMP("\nlvaUpdateClass:%s Updating class for V%02u", shouldUpdate ? "" : " NOT", varNum);
JITDUMP(" from (%p) %s%s", dspPtr(varDsc->lvClassHnd), eeGetClassName(varDsc->lvClassHnd),
varDsc->lvClassIsExact ? " [exact]" : "");
JITDUMP(" to (%p) %s%s\n", dspPtr(clsHnd), eeGetClassName(clsHnd), isExact ? " [exact]" : "");
}
#endif // DEBUG

if (shouldUpdate)
{
assert(!varDsc->lvClassIsExact ||
((info.compCompHnd->getClassAttribs(varDsc->lvClassHnd) & CORINFO_FLG_SHAREDINST) != 0));

varDsc->lvClassHnd = clsHnd;
varDsc->lvClassIsExact = isExact;

Expand Down
5 changes: 3 additions & 2 deletions src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2860,8 +2860,9 @@ private bool isMoreSpecificType(CORINFO_CLASS_STRUCT_* cls1, CORINFO_CLASS_STRUC
if (isType1CanonSubtype != isType2CanonSubtype)
{
// Only one of type1 and type2 is shared.
// type2 is more specific if type1 is the shared type.
return isType1CanonSubtype;
// type2 is more specific if type1 can't be assigned there.
return isType1CanonSubtype && !type1.CanCastTo(type2) ||
isType2CanonSubtype && type2.CanCastTo(type1);
}

// Otherwise both types are either shared or not shared.
Expand Down
5 changes: 3 additions & 2 deletions src/coreclr/vm/jitinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4563,8 +4563,9 @@ static BOOL isMoreSpecificTypeHelper(
if (isHnd1CanonSubtype != isHnd2CanonSubtype)
{
// Only one of hnd1 and hnd2 is shared.
// hdn2 is more specific if hnd1 is the shared type.
return isHnd1CanonSubtype;
// hdn2 is more specific if hnd1 can't be assigned there.
return (isHnd1CanonSubtype && !hnd1.CanCastTo(hnd2)) ||
(isHnd2CanonSubtype && hnd2.CanCastTo(hnd1));
}

// Otherwise both types are either shared or not shared.
Expand Down