Skip to content

Don't scan finalizable leaf objects #785

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

Closed
wants to merge 1 commit into from
Closed

Don't scan finalizable leaf objects #785

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: 15 additions & 7 deletions lib/Common/Memory/SmallNormalHeapBucket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ SmallNormalHeapBucketBase<TBlockType>::RescanObjectsOnPage(TBlockType * block, c
return true;
}

if (startObjectAddress != pageAddress)
if (pageByteOffset % localObjectSize != 0)
{
// If the last object on the previous page that spans into the current page is marked,
// we need to count that in the markCount for rescan
Expand All @@ -149,23 +149,31 @@ SmallNormalHeapBucketBase<TBlockType>::RescanObjectsOnPage(TBlockType * block, c
const uint objectBitDelta = SmallHeapBlockT<TBlockAttributes>::GetObjectBitDeltaForBucketIndex(bucketIndex);

uint rescanCount = 0;
uint skipCount = 0;
uint objectIndex = firstObjectOnPageIndex;

for (uint bitIndex = startBitIndex; rescanCount < rescanMarkCount; objectIndex++, bitIndex += objectBitDelta)
for (uint bitIndex = startBitIndex; rescanCount+ skipCount < rescanMarkCount; objectIndex++, bitIndex += objectBitDelta)
{
Assert(objectIndex < localObjectCount);
Assert(!HeapInfo::GetInvalidBitVectorForBucket<TBlockAttributes>(bucketIndex)->Test(bitIndex));

if (heapBlockMarkBits->Test(bitIndex))
{
char * objectAddress = blockStartAddress + objectIndex * localObjectSize;
if (!TBlockType::RescanObject(block, objectAddress, localObjectSize, objectIndex, recycler))
if (block && (block->ObjectInfo(objectIndex) & LeafBit))
{
// Failed to add to the mark stack due to OOM.
return false;
skipCount++;
}
else
{
char * objectAddress = blockStartAddress + objectIndex * localObjectSize;
if (!TBlockType::RescanObject(block, objectAddress, localObjectSize, objectIndex, recycler))
{
// Failed to add to the mark stack due to OOM.
return false;
}

rescanCount++;
rescanCount++;
}
}
}

Expand Down