--- a/src/hotspot/share/memory/filemap.cpp	Tue May 14 11:06:23 2019 +0800
+++ b/src/hotspot/share/memory/filemap.cpp	Tue May 14 12:00:49 2019 +0200
@@ -877,7 +877,7 @@
   MemTracker::record_virtual_memory_type((address)base, mtClassShared);
 #endif
 
-  if (!verify_region_checksum(i)) {
+  if (VerifySharedSpaces && !verify_region_checksum(i)) {
     return NULL;
   }
 
@@ -1143,9 +1143,11 @@
 
 bool FileMapInfo::verify_mapped_heap_regions(int first, int num) {
   assert(num > 0, "sanity");
-  for (int i = first; i < first + num; i++) {
-    if (!verify_region_checksum(i)) {
-      return false;
+  if (VerifySharedSpaces) {
+    for (int i = first; i < first + num; i++) {
+      if (!verify_region_checksum(i)) {
+        return false;
+      }
     }
   }
   return true;
@@ -1204,9 +1206,7 @@
 #endif // INCLUDE_CDS_JAVA_HEAP
 
 bool FileMapInfo::verify_region_checksum(int i) {
-  if (!VerifySharedSpaces) {
-    return true;
-  }
+  assert(VerifySharedSpaces, "sanity");
 
   size_t sz = space_at(i)->_used;