src/hotspot/share/classfile/systemDictionaryShared.cpp

*** 56,10 ***
--- 56,11 ---
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
+ #include "oops/compressedKlass.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/klass.inline.hpp"
  #include "oops/objArrayKlass.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"

*** 1309,12 ***
  InstanceKlass* SystemDictionaryShared::find_builtin_class(Symbol* name) {
    const RunTimeClassInfo* record = find_record(&_static_archive._builtin_dictionary,
                                                 &_dynamic_archive._builtin_dictionary,
                                                 name);
    if (record != nullptr) {
      assert(!record->_klass->is_hidden(), "hidden class cannot be looked up by name");
-     assert(check_alignment(record->_klass), "Address not aligned");
      // We did not save the classfile data of the generated LambdaForm invoker classes,
      // so we cannot support CLFH for such classes.
      if (record->_klass->is_generated_shared_class() && JvmtiExport::should_post_class_file_load_hook()) {
         return nullptr;
      }
--- 1310,16 ---
  InstanceKlass* SystemDictionaryShared::find_builtin_class(Symbol* name) {
    const RunTimeClassInfo* record = find_record(&_static_archive._builtin_dictionary,
                                                 &_dynamic_archive._builtin_dictionary,
                                                 name);
    if (record != nullptr) {
+ #ifdef ASSERT
+     if (UseCompressedClassPointers) {
+       CompressedKlassPointers::verify_klass_pointer(record->_klass);
+     }
+ #endif
      assert(!record->_klass->is_hidden(), "hidden class cannot be looked up by name");
      // We did not save the classfile data of the generated LambdaForm invoker classes,
      // so we cannot support CLFH for such classes.
      if (record->_klass->is_generated_shared_class() && JvmtiExport::should_post_class_file_load_hook()) {
         return nullptr;
      }