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

rev 50092 : [mq]: allocations-rt.patch

@@ -388,11 +388,11 @@
     size_t hdr_size = oopDesc::header_size();
     Copy::fill_to_words(obj + hdr_size, new_tlab_size - hdr_size, badHeapWordVal);
 #endif // ASSERT
   }
   thread->tlab().fill(obj, obj + size, new_tlab_size);
-  return Universe::heap()->tlab_post_allocation_setup(obj);
+  return obj;
 }
 
 size_t CollectedHeap::max_tlab_size() const {
   // TLABs can't be bigger than we can fill with a int[Integer.MAX_VALUE].
   // This restriction could be removed by enabling filling with multiple arrays.

@@ -465,11 +465,11 @@
 
 void CollectedHeap::fill_with_object(HeapWord* start, size_t words, bool zap)
 {
   DEBUG_ONLY(fill_args_check(start, words);)
   HandleMark hm;  // Free handles before leaving.
-  fill_with_object_impl(start, words, zap);
+  Universe::heap()->fill_with_object_impl(start, words, zap);
 }
 
 void CollectedHeap::fill_with_objects(HeapWord* start, size_t words, bool zap)
 {
   DEBUG_ONLY(fill_args_check(start, words);)

@@ -485,11 +485,11 @@
     fill_with_array(start, cur, zap);
     start += cur;
     words -= cur;
   }
 
-  fill_with_object_impl(start, words, zap);
+  Universe::heap()->fill_with_object_impl(start, words, zap);
 }
 
 HeapWord* CollectedHeap::allocate_new_tlab(size_t size) {
   guarantee(false, "thread-local allocation buffers not supported");
   return NULL;

@@ -626,14 +626,10 @@
 
 void CollectedHeap::unpin_object(JavaThread* thread, oop obj) {
   ShouldNotReachHere();
 }
 
-HeapWord* CollectedHeap::tlab_post_allocation_setup(HeapWord* obj) {
-  return obj;
-}
-
 uint CollectedHeap::oop_extra_words() {
   // Default implementation doesn't need extra space for oops.
   return 0;
 }