src/hotspot/share/gc/shared/collectedHeap.cpp

@@ -444,11 +444,11 @@
 void CollectedHeap::fill_with_dummy_object(HeapWord* start, HeapWord* end, bool zap) {
   CollectedHeap::fill_with_object(start, end, zap);
 }
 
 size_t CollectedHeap::min_dummy_object_size() const {
-  return oopDesc::header_size();
+  return cell_size(oopDesc::header_size());
 }
 
 size_t CollectedHeap::tlab_alloc_reserve() const {
   size_t min_size = min_dummy_object_size();
   return min_size > (size_t)MinObjAlignment ? align_object_size(min_size) : 0;

@@ -593,9 +593,5 @@
 }
 
 void CollectedHeap::deduplicate_string(oop str) {
   // Do nothing, unless overridden in subclass.
 }
-
-size_t CollectedHeap::obj_size(oop obj) const {
-  return obj->size();
-}