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

JIT: Enable inlining for late devirtualization #110827

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
+96 −31
Open

JIT: Enable inlining for late devirtualization #110827

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
686f64e
Enable inlining for late devirt
hez2010 Jan 20, 2025
27cc1ce
Pass correct IL offset
hez2010 Jan 20, 2025
21a5adb
Only creates RET_EXPR if the node is not top-level or not returning void
hez2010 Jan 20, 2025
d1d5181
Do not try inlining if BBF_INTERNAL is set
hez2010 Jan 20, 2025
cd9f817
Ensure the type matches
hez2010 Jan 20, 2025
aad3d7e
Set inliner context correctly
hez2010 Jan 20, 2025
3f5204b
Merge branch 'main' into inline-exact-devirt
hez2010 Jan 21, 2025
3b5b446
Address review feedbacks
hez2010 Jan 21, 2025
27bc0aa
Fix non inline candidate marking
hez2010 Jan 21, 2025
dbf204a
Handle calls with retbuf
hez2010 Jan 21, 2025
f6d38c4
Handle BBF_INTERNAL
hez2010 Jan 21, 2025
10de97b
Get real type from local
hez2010 Jan 22, 2025
472e140
Always set IL offset
hez2010 Jan 22, 2025
20b1a94
Add comments
hez2010 Jan 22, 2025
5c9c927
Oops
hez2010 Jan 22, 2025
97326e2
Use gtReturnType instead
hez2010 Jan 22, 2025
096ab2a
Remove unused ilOffset
hez2010 Jan 22, 2025
095a981
Use genActualType
hez2010 Jan 22, 2025
614618a
Merge branch 'main' into inline-exact-devirt
hez2010 Jan 22, 2025
5951462
Remove unnecessary spillTemp
hez2010 Jan 22, 2025
03c0df5
Handle nested call correctly
hez2010 Jan 22, 2025
0042519
Don't promote compCurStmt
hez2010 Jan 22, 2025
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
7 changes: 5 additions & 2 deletions src/coreclr/jit/fginline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,11 @@ class SubstitutePlaceholdersAndDevirtualizeWalker : public GenTreeVisitor<Substi
isLateDevirtualization, explicitTailCall);
if (context != nullptr)
{
IL_OFFSET ilOffset = BAD_IL_OFFSET;
INDEBUG(ilOffset = call->gtRawILOffset);
#if defined(DEBUG)
IL_OFFSET ilOffset = call->gtRawILOffset;
#else
IL_OFFSET ilOffset = m_curStmt->GetDebugInfo().GetLocation().GetOffset();
hez2010 marked this conversation as resolved.
Show resolved Hide resolved
#endif // defined(DEBUG)
CORINFO_CALL_INFO callInfo = {};
callInfo.hMethod = method;
callInfo.methodFlags = methodFlags;
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/jit/importercalls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ var_types Compiler::impImportCall(OPCODE opcode,
assert((sig->callConv & CORINFO_CALLCONV_MASK) != CORINFO_CALLCONV_VARARG &&
(sig->callConv & CORINFO_CALLCONV_MASK) != CORINFO_CALLCONV_NATIVEVARARG);

call = gtNewIndCallNode(stubAddr, callRetTyp);
call = gtNewIndCallNode(stubAddr, callRetTyp, di);

call->gtFlags |= GTF_EXCEPT | (stubAddr->gtFlags & GTF_GLOB_EFFECT);
call->gtFlags |= GTF_CALL_VIRT_STUB;
Expand Down Expand Up @@ -1027,7 +1027,7 @@ var_types Compiler::impImportCall(OPCODE opcode,
if (!bIntrinsicImported)
{
// Keep track of the raw IL offset of the call
INDEBUG(call->AsCall()->gtRawILOffset = rawILOffset);
call->AsCall()->gtRawILOffset = rawILOffset;

// Is it an inline candidate?
impMarkInlineCandidate(call, exactContextHnd, exactContextNeedsRuntimeLookup, callInfo, rawILOffset);
Expand Down Expand Up @@ -1237,7 +1237,7 @@ var_types Compiler::impImportCall(OPCODE opcode,
}

// Keep track of the raw IL offset of the call
INDEBUG(call->AsCall()->gtRawILOffset = rawILOffset);
call->AsCall()->gtRawILOffset = rawILOffset;

// Is it an inline candidate?
impMarkInlineCandidate(call, exactContextHnd, exactContextNeedsRuntimeLookup, callInfo, rawILOffset);
Expand Down
Loading