Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 11 additions & 15 deletions src/jit/gentree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15789,23 +15789,19 @@ bool GenTree::IsFieldAddr(Compiler* comp, GenTreePtr* pObj, GenTreePtr* pStatic,
baseAddr = gtOp.gtOp1;
}
}
// Check if "this" has a zero-offset annotation.
else if (comp->GetZeroOffsetFieldMap()->Lookup(this, &newFldSeq))
{
baseAddr = this;
mustBeStatic = true;
}
else if (OperGet() == GT_CNS_INT && gtIntCon.gtFieldSeq != nullptr)
{
// Address is a literal constant; must be a static field.
newFldSeq = gtIntCon.gtFieldSeq;
baseAddr = this;
mustBeStatic = true;
}
else
{
// This is not a field address.
return false;
// Check if "this" has a zero-offset annotation.
if (!comp->GetZeroOffsetFieldMap()->Lookup(this, &newFldSeq))
{
// If not, this is not a field address.
return false;
}
else
{
baseAddr = this;
mustBeStatic = true;
}
}

// If not we don't have a field seq, it's not a field address.
Expand Down
2 changes: 1 addition & 1 deletion tests/src/GC/Scenarios/FinalizeTimeout/FinalizeTimeout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ private static void ThreadMain()

private class BlockingFinalizerOnShutdown
{
public volatile static bool finalizerCompletedOnce = false;
public static bool finalizerCompletedOnce = false;
public bool isLastObject = false;

~BlockingFinalizerOnShutdown()
Expand Down