8242114: Shenandoah: remove ShenandoahHeapRegion::reset_alloc_metadat…

…a_to_shared Reviewed-by: rkennke
openjdk · Apr 6, 2020 · b73460b · b73460b
1 parent 5aed216
commit b73460b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -313,7 +313,6 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
     }
 
     r->set_top(r->bottom() + used_words);
-    r->reset_alloc_metadata_to_shared();
 
     _mutator_free_bitmap.clear_bit(r->index());
   }

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -308,15 +308,6 @@ void ShenandoahHeapRegion::reset_alloc_metadata() {
   _gclab_allocs = 0;
 }
 
-void ShenandoahHeapRegion::reset_alloc_metadata_to_shared() {
-  if (used() > 0) {
-    _tlab_allocs = 0;
-    _gclab_allocs = 0;
-  } else {
-    reset_alloc_metadata();
-  }
-}
-
 size_t ShenandoahHeapRegion::get_shared_allocs() const {
   return used() - (_tlab_allocs + _gclab_allocs) * HeapWordSize;
 }

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
@@ -377,7 +377,6 @@ class ShenandoahHeapRegion {
   size_t free() const           { return byte_size(top(),    end()); }
 
   inline void adjust_alloc_metadata(ShenandoahAllocRequest::Type type, size_t);
-  void reset_alloc_metadata_to_shared();
   void reset_alloc_metadata();
   size_t get_shared_allocs() const;
   size_t get_tlab_allocs() const;

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
@@ -868,7 +868,7 @@ class ShenandoahPostCompactClosure : public ShenandoahHeapRegionClosure {
     }
 
     r->set_live_data(live);
-    r->reset_alloc_metadata_to_shared();
+    r->reset_alloc_metadata();
     _live += live;
   }
 
@@ -934,7 +934,7 @@ void ShenandoahMarkCompact::compact_humongous_objects() {
             r->set_top(r->end());
           }
 
-          r->reset_alloc_metadata_to_shared();
+          r->reset_alloc_metadata();
         }
       }
     }