wip

Author: tstuefe

src/hotspot/share/memory/metaspace.cpp

@@ -1041,13 +1041,18 @@ bool Metaspace::is_in_nonclass_metaspace(const void* ptr) {
   return VirtualSpaceList::vslist_nonclass()->contains((MetaWord*)ptr);
 }
 
-#ifdef ASSERT
 bool Metaspace::metadata_is_live(const Metadata* md) {
+#ifndef ASSERT
+  return contains(md);
+#else
   return md->metadata_token_is_valid() && contains(md); // flesh out later
+#endif
 }
 
 bool Metaspace::klass_is_live(const Klass* k, bool must_have_narrow_klass_id) {
+#ifndef ASSERT
+  return contains(k);
+#else
   return ((const Metadata*)k)->metadata_token_is_valid_klass() && contains(k); // flesh out later
+#endif
 }
-
-#endif // ASSERT

src/hotspot/share/memory/metaspace.hpp

@@ -155,16 +155,15 @@ class Metaspace : public AllStatic {
     return ptr < _class_space_end && ptr >= _class_space_start;
   }
 
-#ifdef ASSERT
   // xxx_is_live functions returns true if the pointer given points to
-  // valid metadata. In detail, it checks that:
+  // valid metadata. In release builds, it is equivalent to Metaspace::contains. In debug
+  // builds, it checks that:
   // - the specified metadata is inside class-space or metaspace in committed, readable memory
   // - not marked as dead space (i.e. not returned prematurely via Metaspace::deallocate)
   // - correctly aligned for the type (esp. Klass)
   // - Metadata token is valid specific to this type
   static bool metadata_is_live(const Metadata* md);
   static bool klass_is_live(const Klass* k, bool must_have_narrow_klass_id);
-#endif
 
   // Free empty virtualspaces
   static void purge(bool classes_unloaded);