Revert "[heap] Do not recompute limits in NotifyLoadingEnded"

manoskouk · V8 LUCI CQ · commit 5fa62dd74a1d · 2026-01-08T04:01:57.000-08:00
This reverts commit f0ecc67. Reason for revert: Blocks V8 roll into chromium. E.g. https://chromium-review.googlesource.com/c/chromium/src/+/7414660 Original change's description: > [heap] Do not recompute limits in NotifyLoadingEnded > > We recently started resetting limits on incremental marking start > to avoid finalizing incremental marking prematurely in some scenarios. > > For loading we had a similar issue, in order to fix this we > recompute limits in NotifyLoadingEnded(). But resetting allocation > limits on incremental marking start also incidentally addresses the > issue Omer discovered with loading. So in this CL we simply stop > updating allocation limits at all in NotifyLoadingEnded(). > > Initially I wasn't sure whether a change like this should go through > finch. But according to Omer recomputing the limit on > NotifyLoadingEnded did not have impact, so going back to baseline > should not regress anything either. > > In addition this CL also starts resetting allocation limits > unconditionally on incremental marking start. Previously we only > did this when the loading phase was entered but not exited yet. > > Bug: 444705203 > Change-Id: I7dfbf6fcfc6c5db0b7e0416811c4bca85de6f420 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7368051 > Reviewed-by: Michael Lippautz <mlippautz@chromium.org> > Reviewed-by: Omer Katz <omerkatz@chromium.org> > Commit-Queue: Dominik Inführ <dinfuehr@chromium.org> > Cr-Commit-Position: refs/heads/main@{#104524} Bug: 444705203 No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I7b5840c2ecea403b9bc117c572b56a01a974bcfe Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7415020 Reviewed-by: Manos Koukoutos <manoskouk@chromium.org> Owners-Override: Manos Koukoutos <manoskouk@chromium.org> Reviewed-by: Omer Katz <omerkatz@chromium.org> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org> Cr-Commit-Position: refs/heads/main@{#104555}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
@@ -2041,7 +2041,7 @@ void Heap::StartIncrementalMarking(GCFlags gc_flags,
 
   incremental_marking()->Start(collector, gc_reason, reason);
 
-  if (collector == GarbageCollector::MARK_COMPACTOR) {
+  if (collector == GarbageCollector::MARK_COMPACTOR && IsLoadingInitialized()) {
     // During loading we might overshoot the limit by a large amount. Ensure
     // allocation limits are at least at or above current sizes to not finalize
     // incremental marking prematurely.
@@ -7854,6 +7854,7 @@ void Heap::NotifyLoadingStarted() {
 void Heap::NotifyLoadingEnded(LeaveHeapState context) {
   load_start_time_ms_.store(kLoadTimeNotLoading, std::memory_order_relaxed);
   if (context == LeaveHeapState::kNotify) {
+    RecomputeLimitsAfterLoadingIfNeeded();
     if (auto* job = incremental_marking()->incremental_marking_job()) {
       // The task will start incremental marking (if needed not already started)
       // and advance marking if incremental marking is active.
