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

Propagate typeof() during inlining #71778

Merged
merged 8 commits into from
Jul 10, 2022
Merged

Propagate typeof() during inlining #71778

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2c81bb
Propagate typeof() during inlining
EgorBo Jul 7, 2022
ac821f5
test
EgorBo Jul 8, 2022
b8df761
Clean up
EgorBo Jul 8, 2022
906c097
test
EgorBo Jul 9, 2022
f60d6f6
fold typeof() != null
EgorBo Jul 9, 2022
d4ecae9
Update src/coreclr/jit/gentree.cpp
EgorBo Jul 9, 2022
a5f4e3e
clean up
EgorBo Jul 9, 2022
262c9d3
clean up
EgorBo Jul 10, 2022
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
13 changes: 2 additions & 11 deletions src/coreclr/jit/fginline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,21 +1604,12 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
}
else
{
/* The argument is either not used or a const or lcl var */

// The argument is either not used or a const or lcl var
noway_assert(!argInfo.argIsUsed || argInfo.argIsInvariant || argInfo.argIsLclVar);

/* Make sure we didnt change argNode's along the way, or else
subsequent uses of the arg would have worked with the bashed value */
if (argInfo.argIsInvariant)
{
assert(argNode->OperIsConst() || argNode->gtOper == GT_ADDR);
}
noway_assert((argInfo.argIsLclVar == 0) ==
(argNode->gtOper != GT_LCL_VAR || (argNode->gtFlags & GTF_GLOB_REF)));

/* If the argument has side effects, append it */

// If the argument has side effects, append it
if (argInfo.argHasSideEff)
{
noway_assert(argInfo.argIsUsed == false);
Expand Down
18 changes: 10 additions & 8 deletions src/coreclr/jit/gentree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12913,17 +12913,19 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)

// Screen for the right kinds of operands
GenTree* const op1 = tree->AsOp()->gtOp1;
const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
if (op1Kind == TPK_Unknown)
{
return tree;
}

GenTree* const op2 = tree->AsOp()->gtOp2;
const TypeProducerKind op1Kind = gtGetTypeProducerKind(op1);
const TypeProducerKind op2Kind = gtGetTypeProducerKind(op2);
if (op2Kind == TPK_Unknown)

// Fold "typeof(handle) cmp null"
if ((op2->IsIntegralConst(0) && (op1Kind == TPK_Handle)) || (op1->IsIntegralConst(0) && (op2Kind == TPK_Handle)))
{
return tree;
GenTree* call = op1Kind == TPK_Handle ? op1 : op2;
GenTree* handle = call->AsCall()->gtArgs.GetArgByIndex(0)->GetNode();
if (gtGetHelperArgClassHandle(handle) != NO_CLASS_HANDLE)
{
return oper == GT_EQ ? gtNewFalse() : gtNewTrue();
}
}

// If both types are created via handles, we can simply compare
Expand Down
22 changes: 15 additions & 7 deletions src/coreclr/jit/importer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20206,6 +20206,17 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
return;
}
}
else
{
if (curArgVal->IsCall() &&
(curArgVal->AsCall()->gtCallMethHnd == eeFindHelper(CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE)) &&
(gtGetHelperArgClassHandle(curArgVal->AsCall()->gtArgs.GetArgByIndex(0)->GetEarlyNode()) !=
NO_CLASS_HANDLE))
{
inlCurArgInfo->argIsInvariant = true;
inlCurArgInfo->argHasSideEff = false;
}
}

bool isExact = false;
bool isNonNull = false;
Expand Down Expand Up @@ -20242,7 +20253,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
}
if (inlCurArgInfo->argIsInvariant)
{
printf(" is a constant");
printf(" is a constant or invariant");
}
if (inlCurArgInfo->argHasGlobRef)
{
Expand Down Expand Up @@ -20510,8 +20521,7 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)
// Try to fold the node in case we have constant arguments.
if (inlArgInfo[i].argIsInvariant)
{
inlArgNode = gtFoldExprConst(inlArgNode);
assert(inlArgNode->OperIsConst());
inlArgNode = gtFoldExpr(inlArgNode);
}
*pInlArgNode = inlArgNode;
}
Expand All @@ -20523,12 +20533,10 @@ void Compiler::impInlineInitVars(InlineInfo* pInlineInfo)

inlArgInfo[i].argIsLclVar = false;

/* Try to fold the node in case we have constant arguments */

// Try to fold the node in case we have constant arguments.
if (inlArgInfo[i].argIsInvariant)
{
inlArgNode = gtFoldExprConst(inlArgNode);
assert(inlArgNode->OperIsConst());
inlArgNode = gtFoldExpr(inlArgNode);
}
*pInlArgNode = inlArgNode;
}
Expand Down