src/hotspot/share/cds/aotMetaspace.cpp

@@ -75,10 +75,12 @@
  #include "memory/oopFactory.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "nmt/memTracker.hpp"
  #include "oops/compressedKlass.hpp"
+ #include "oops/flatArrayKlass.hpp"
+ #include "oops/inlineKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/klass.inline.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oopHandle.hpp"

@@ -476,11 +478,11 @@
    soc->do_tag(sizeof(Method));
    soc->do_tag(sizeof(ConstMethod));
    soc->do_tag(arrayOopDesc::base_offset_in_bytes(T_BYTE));
    soc->do_tag(sizeof(ConstantPool));
    soc->do_tag(sizeof(ConstantPoolCache));
-   soc->do_tag(objArrayOopDesc::base_offset_in_bytes());
+   soc->do_tag(refArrayOopDesc::base_offset_in_bytes());
    soc->do_tag(typeArrayOopDesc::base_offset_in_bytes(T_BYTE));
    soc->do_tag(sizeof(Symbol));
  
    // Need to do this first, as subsequent steps may call virtual functions
    // in archived Metadata objects.

@@ -1258,10 +1260,15 @@
      return false;
    }
  }
  
  void VM_PopulateDumpSharedSpace::dump_java_heap_objects() {
+   if (CDSConfig::is_valhalla_preview()) {
+     log_info(cds)("Archived java heap is not yet supported with Valhalla preview");
+     return;
+   }
+ 
    if (CDSConfig::is_dumping_heap()) {
      HeapShared::write_heap(&_heap_info);
    } else {
      CDSConfig::log_reasons_for_not_dumping_heap();
    }