corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1944789 - Clear the allocated during collection flag sooner after buffer allocator sweeping r=sfink

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D236108
This commit is contained in:
Jon Coppeard
2025-02-03 16:33:34 +00:00
parent 76506381dc
commit 4a200a0283
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
js/src/gc/BufferAllocator.cpp
View File

@@ -1017,6 +1017,16 @@ void BufferAllocator::finishMajorCollection(const AutoLock& lock) {
// This can be called without startMajorSweeping if collection is aborted.
MOZ_ASSERT(majorState == State::Marking || majorState == State::Sweeping);
ClearAllocatedDuringCollection(mediumMixedChunks.ref());
ClearAllocatedDuringCollection(mediumTenuredChunks.ref());
// This flag is not set for large nursery-owned allocations.
ClearAllocatedDuringCollection(largeTenuredAllocs.ref());
if (minorState == State::Sweeping) {
// Ensure this flag is cleared when chunks are merged in mergeSweptData.
majorFinishedWhileMinorSweeping = true;
}
if (minorState == State::Sweeping || majorState == State::Sweeping) {
mergeSweptData(lock);
}
@@ -1026,17 +1036,6 @@ void BufferAllocator::finishMajorCollection(const AutoLock& lock) {
MOZ_ASSERT_IF(majorState == State::Sweeping,
mediumTenuredChunksToSweep.ref().isEmpty());
// TODO: It may be more efficient if we can clear this flag before merging
// swept data above.
ClearAllocatedDuringCollection(mediumMixedChunks.ref());
ClearAllocatedDuringCollection(mediumTenuredChunks.ref());
// This flag is not set for large nursery-owned allocations.
ClearAllocatedDuringCollection(largeTenuredAllocs.ref());
if (minorState == State::Sweeping) {
// Ensure this flag is cleared when chunks are merged in mergeSweptData.
majorFinishedWhileMinorSweeping = true;
}
if (majorState == State::Marking) {
// We have aborted collection without sweeping this zone. Restore or rebuild
// the original state.
@@ -1120,6 +1119,7 @@ void BufferAllocator::mergeSweptData(const AutoLock& lock) {
for (BufferChunk* chunk : sweptMediumTenuredChunks.ref()) {
MOZ_ASSERT(!chunk->hasNurseryOwnedAllocs);
MOZ_ASSERT(!chunk->hasNurseryOwnedAllocsAfterSweep);
MOZ_ASSERT(!chunk->allocatedDuringCollection);
}
#endif
mediumTenuredChunks.ref().prepend(std::move(sweptMediumTenuredChunks.ref()));