--- a/hotspot/src/share/vm/memory/metaspace.cpp	Wed Jun 28 19:12:58 2017 -0400
+++ b/hotspot/src/share/vm/memory/metaspace.cpp	Thu Jun 29 12:35:30 2017 +0200
@@ -4106,6 +4106,10 @@
   }
 }
 
+#endif // !PRODUCT
+
+#ifdef ASSERT
+
 // ChunkManagerReturnTest stresses taking/returning chunks from the ChunkManager. It takes and
 // returns chunks from/to the ChunkManager while keeping track of the expected ChunkManager
 // content.
@@ -4415,4 +4419,4 @@
   SpaceManagerTest::test_adjust_initial_chunk_size();
 }
 
-#endif
+#endif // ASSERT