--- old/src/share/vm/gc/shenandoah/shenandoahConnectionMatrix.cpp	2017-04-24 16:58:39.779120621 +0200
+++ new/src/share/vm/gc/shenandoah/shenandoahConnectionMatrix.cpp	2017-04-24 16:58:39.651124914 +0200
@@ -34,7 +34,7 @@
   _stride(max_regions),
   _region_shift(ShenandoahHeapRegion::region_size_shift()),
   _matrix(NEW_C_HEAP_ARRAY(char, max_regions * max_regions, mtGC)),
-  _magic_offset( ((uintptr_t) _matrix) - ( ((uintptr_t) ShenandoahHeap::heap()->first_region_bottom()) >> _region_shift) * (_stride + 1))
+  _magic_offset( ((uintptr_t) _matrix) - ( ((uintptr_t) ShenandoahHeap::heap()->base()) >> _region_shift) * (_stride + 1))
 
 {
   if (UseShenandoahMatrix) {