--- a/hotspot/src/share/vm/gc/g1/g1HeapVerifier.hpp	Thu Aug 03 22:40:26 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1HeapVerifier.hpp	Fri Aug 04 14:15:42 2017 +0200
@@ -82,7 +82,7 @@
   // range [from,limit). If it does, print an error message and return
   // false. Otherwise, just return true. bitmap_name should be "prev"
   // or "next".
-  bool verify_no_bits_over_tams(const char* bitmap_name, G1CMBitMapRO* bitmap,
+  bool verify_no_bits_over_tams(const char* bitmap_name, const G1CMBitMap* const bitmap,
                                 HeapWord* from, HeapWord* limit);
 
   // Verify that the prev / next bitmap range [tams,end) for the given