--- old/src/share/vm/gc/shared/collectedHeap.cpp	2015-10-14 13:54:00.234227625 +0200
+++ new/src/share/vm/gc/shared/collectedHeap.cpp	2015-10-14 13:54:00.083231276 +0200
@@ -319,7 +319,7 @@
 #endif // ASSERT
   }
   thread->tlab().fill(obj, obj + size, new_tlab_size);
-  return obj;
+  return Universe::heap()->tlab_post_allocation_setup(obj);
 }
 
 void CollectedHeap::flush_deferred_store_barrier(JavaThread* thread) {
@@ -631,3 +631,26 @@
       err_msg("after_heap: " PTR_FORMAT " is unexpectedly in the heap", p2i(after_heap)));
 }
 #endif
+
+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;
+}
+
+void CollectedHeap::shutdown() {
+  // Default implementation does nothing.
+}
+
+void CollectedHeap::accumulate_statistics_all_gclabs() {
+  // Default implementation does nothing.
+}
+
+#ifndef CC_INTERP
+void CollectedHeap::compile_prepare_oop(MacroAssembler* masm, Register obj) {
+  // Default implementation does nothing.
+}
+#endif