Skip to content

JIT: allow stack allocation of R2R arrays allocated with explicit-type helpers #136038

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

Open
lewing wants to merge 1 commit into
base: main
Choose a base branch
from
Open

JIT: allow stack allocation of R2R arrays allocated with explicit-type helpers #136038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 5 additions & 17 deletions src/coreclr/jit/objectalloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ ObjectAllocator::ObjectAllocator(Compiler* comp)
: Phase(comp, PHASE_ALLOCATE_OBJECTS)
, m_IsObjectStackAllocationEnabled(false)
, m_AnalysisDone(false)
, m_isR2R(comp->IsReadyToRun())
, m_bvCount(0)
, m_bitVecTraits(BitVecTraits(comp->lvaCount, comp))
, m_unknownSourceIndex(BAD_VAR_NUM)
Expand Down Expand Up @@ -1286,9 +1285,12 @@ ObjectAllocator::ObjectAllocationType ObjectAllocator::AllocationKind(GenTree* t
bool const canBeOnStack = isValueClass || m_compiler->info.compCompHnd->canAllocateOnStack(clsHnd);
allocType = canBeOnStack ? OAT_NEWOBJ : OAT_NEWOBJ_HEAP;
}
else if (!m_isR2R && tree->IsHelperCall())
else if (tree->IsHelperCall())
{
GenTreeCall* const call = tree->AsCall();

// CORINFO_HELP_READYTORUN_NEWARR_1 is not listed: it has no type argument for the
// stack allocation expansion to use.
switch (call->GetHelperNum())
{
case CORINFO_HELP_NEWARR_1_VC:
Expand Down Expand Up @@ -1559,28 +1561,14 @@ bool ObjectAllocator::MorphAllocObjNodeHelperArr(AllocationCandidate& candidate)
{
assert(candidate.m_block->HasFlag(BBF_HAS_NEWARR));

// R2R not yet supported
//
if (m_isR2R)
{
candidate.m_onHeapReason = "[R2R array not yet supported]";
return false;
}

GenTree* const data = candidate.m_tree->AsLclVar()->Data();

//------------------------------------------------------------------------
// We expect the following expression tree at this point
// For non-ReadyToRun:
// STMTx (IL 0x... ???)
// * STORE_LCL_VAR ref
// \--* CALL help ref
// +--* CNS_INT(h) long
// \--* CNS_INT long
// For ReadyToRun:
// STMTx (IL 0x... ???)
// * STORE_LCL_VAR ref
// \--* CALL help ref
// +--* (type handle)
// \--* CNS_INT long
//------------------------------------------------------------------------

Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/objectalloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ class ObjectAllocator final : public Phase
// Data members
bool m_IsObjectStackAllocationEnabled;
bool m_AnalysisDone;
bool m_isR2R;
unsigned m_bvCount;
BitVecTraits m_bitVecTraits;
unsigned m_unknownSourceIndex;
Expand Down
Loading