--- old/src/share/vm/gc/shenandoah/shenandoahHeap.hpp	2017-03-15 14:00:41.334684488 +0100
+++ new/src/share/vm/gc/shenandoah/shenandoahHeap.hpp	2017-03-15 14:00:41.282684626 +0100
@@ -134,6 +134,9 @@
   static ShenandoahHeap* _pgc;
   ShenandoahCollectorPolicy* _shenandoah_policy;
   VirtualSpace _storage;
+  size_t _bitmap_size;
+  MemRegion _heap_region;
+
   ShenandoahHeapRegion* _first_region;
   HeapWord* _first_region_bottom;
 
@@ -300,7 +303,6 @@
   void evacuate_and_update_roots();
 
   void do_partial_collection();
-  void verify_matrix();
 private:
   void set_evacuation_in_progress(bool in_progress);
 public:
@@ -409,6 +411,7 @@
 
   void verify_heap_after_evacuation();
   void verify_heap_after_marking();
+  void verify_heap_reachable_at_safepoint();
 
   // Delete entries for dead interned string and clean up unreferenced symbols
   // in symbol table, possibly in parallel.