--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp	Thu Sep 05 08:26:44 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp	Thu Sep 05 08:26:49 2019 +0200
@@ -99,11 +99,11 @@
 
   _archive_check_enabled = true;
   size_t length = G1CollectedHeap::heap()->max_reserved_capacity();
-  _closed_archive_region_map.initialize((HeapWord*)Universe::heap()->base(),
-                                        (HeapWord*)Universe::heap()->base() + length,
+  _closed_archive_region_map.initialize(G1CollectedHeap::heap()->base(),
+                                        G1CollectedHeap::heap()->base() + length,
                                         HeapRegion::GrainBytes);
-  _open_archive_region_map.initialize((HeapWord*)Universe::heap()->base(),
-                                      (HeapWord*)Universe::heap()->base() + length,
+  _open_archive_region_map.initialize(G1CollectedHeap::heap()->base(),
+                                      G1CollectedHeap::heap()->base() + length,
                                       HeapRegion::GrainBytes);
 }