src/hotspot/share/gc/z/zHeap.cpp

@@ -271,17 +271,17 @@
   assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
 
   // Update statistics
   ZStatSample(ZSamplerHeapUsedBeforeMark, used());
 
-  // Retire TLABs
-  _object_allocator.retire_tlabs();
-
   // Flip address view
   ZAddressMasks::flip_to_marked();
   flip_views();
 
+  // Retire allocating pages
+  _object_allocator.retire_pages();
+
   // Reset allocated/reclaimed/used statistics
   _page_allocator.reset_statistics();
 
   // Reset encountered/dropped/enqueued statistics
   _reference_processor.reset_statistics();

@@ -473,13 +473,10 @@
 
   // Flip address view
   ZAddressMasks::flip_to_remapped();
   flip_views();
 
-  // Remap TLABs
-  _object_allocator.remap_tlabs();
-
   // Enter relocate phase
   ZGlobalPhase = ZPhaseRelocate;
 
   // Update statistics
   ZStatHeap::set_at_relocate_start(capacity(), allocated(), used());