--- old/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp	2018-05-13 17:59:42.345222604 +0200
+++ new/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp	2018-05-13 17:59:42.178225507 +0200
@@ -351,7 +351,8 @@
   size_t initial_capacity() const /* override */;
   bool is_in(const void* p) const /* override */;
   bool is_scavengable(oop obj) /* override */;
-  HeapWord* mem_allocate(size_t size, bool* what) /* override */;
+  HeapWord* mem_allocate(size_t size,  Klass* klass, Thread* thread, bool* what) /* override */;
+  void fill_with_object_impl(HeapWord* start, size_t words, bool zap = true) /* override */;
   bool can_elide_tlab_store_barriers() const /* override */;
   oop new_store_pre_barrier(JavaThread* thread, oop new_obj) /* override */;
   bool can_elide_initializing_store_barrier(oop new_obj) /* override */;
@@ -377,7 +378,6 @@
   void safe_object_iterate(ObjectClosure* cl) /* override */;
   size_t unsafe_max_tlab_alloc(Thread *thread) const /* override */;
   size_t max_tlab_size() const /* override */;
-  HeapWord* tlab_post_allocation_setup(HeapWord* obj) /* override */;
   uint oop_extra_words() /* override */;
   size_t tlab_used(Thread* ignored) const /* override */;
   void stop() /* override */;