Skip to content

JIT: Fix stack allocated arrays for NativeAOT #111827

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

Merged
AndyAyersMS merged 4 commits into from
Jan 25, 2025
Merged

JIT: Fix stack allocated arrays for NativeAOT #111827

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
996b0ac
Remove redundant check
hez2010 Jan 25, 2025
8e51c70
Add R2R assertion
hez2010 Jan 25, 2025
327408c
Fix isReadyToRun check
hez2010 Jan 25, 2025
7e9f149
Oops
hez2010 Jan 25, 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
5 changes: 3 additions & 2 deletions src/coreclr/jit/objectalloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ bool ObjectAllocator::MorphAllocObjNodes()
bool didStackAllocate = false;
m_PossiblyStackPointingPointers = BitVecOps::MakeEmpty(&m_bitVecTraits);
m_DefinitelyStackPointingPointers = BitVecOps::MakeEmpty(&m_bitVecTraits);
const bool isReadyToRun = comp->opts.IsReadyToRun() && !comp->IsTargetAbi(CORINFO_NATIVEAOT_ABI);

for (BasicBlock* const block : comp->Blocks())
{
Expand Down Expand Up @@ -419,7 +420,7 @@ bool ObjectAllocator::MorphAllocObjNodes()
{
allocType = OAT_NEWOBJ;
}
else if (!comp->opts.IsReadyToRun() && data->IsHelperCall())
else if (!isReadyToRun && data->IsHelperCall())
{
switch (data->AsCall()->GetHelperNum())
{
Expand Down Expand Up @@ -471,7 +472,7 @@ bool ObjectAllocator::MorphAllocObjNodes()

// R2R not yet supported
//
assert(!comp->opts.IsReadyToRun());
assert(!isReadyToRun);

//------------------------------------------------------------------------
// We expect the following expression tree at this point
Expand Down
Loading