src/hotspot/share/classfile/classLoaderData.cpp

rev 60538 : imported patch jep387-misc.patch

*** 57,66 ****
--- 57,67 ----
  #include "classfile/systemDictionary.hpp"
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/metadataFactory.hpp"
+ #include "memory/metaspace.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oopHandle.inline.hpp"
*** 948,960 ****
--- 949,963 ----
  
    guarantee(this == class_loader_data(cl) || has_class_mirror_holder(), "Must be the same");
    guarantee(cl != NULL || this == ClassLoaderData::the_null_class_loader_data() || has_class_mirror_holder(), "must be");
  
    // Verify the integrity of the allocated space.
+ #ifdef ASSERT
    if (metaspace_or_null() != NULL) {
      metaspace_or_null()->verify();
    }
+ #endif
  
    for (Klass* k = _klasses; k != NULL; k = k->next_link()) {
      guarantee(k->class_loader_data() == this, "Must be the same");
      k->verify();
      assert(k != k->next_link(), "no loops!");