src/hotspot/share/classfile/systemDictionaryShared.cpp

*** 1902,1913 ****
  class CopySharedClassInfoToArchive : StackObj {
    CompactHashtableWriter* _writer;
    bool _is_builtin;
  public:
    CopySharedClassInfoToArchive(CompactHashtableWriter* writer,
!                                bool is_builtin,
!                                bool is_static_archive)
      : _writer(writer), _is_builtin(is_builtin) {}
  
    bool do_entry(InstanceKlass* k, DumpTimeSharedClassInfo& info) {
      if (!info.is_excluded() && info.is_builtin() == _is_builtin) {
        size_t byte_size = RunTimeSharedClassInfo::byte_size(info._klass, info.num_verifier_constraints(), info.num_loader_constraints());
--- 1902,1912 ----
  class CopySharedClassInfoToArchive : StackObj {
    CompactHashtableWriter* _writer;
    bool _is_builtin;
  public:
    CopySharedClassInfoToArchive(CompactHashtableWriter* writer,
!                                bool is_builtin)
      : _writer(writer), _is_builtin(is_builtin) {}
  
    bool do_entry(InstanceKlass* k, DumpTimeSharedClassInfo& info) {
      if (!info.is_excluded() && info.is_builtin() == _is_builtin) {
        size_t byte_size = RunTimeSharedClassInfo::byte_size(info._klass, info.num_verifier_constraints(), info.num_loader_constraints());
*** 1952,1967 ****
    _dumptime_lambda_proxy_class_dictionary->iterate(&copy);
    writer.dump(dictionary, "lambda proxy class dictionary");
  }
  
  void SystemDictionaryShared::write_dictionary(RunTimeSharedDictionary* dictionary,
!                                               bool is_builtin,
!                                               bool is_static_archive) {
    CompactHashtableStats stats;
    dictionary->reset();
    CompactHashtableWriter writer(_dumptime_table->count_of(is_builtin), &stats);
!   CopySharedClassInfoToArchive copy(&writer, is_builtin, is_static_archive);
    _dumptime_table->iterate(&copy);
    writer.dump(dictionary, is_builtin ? "builtin dictionary" : "unregistered dictionary");
  }
  
  void SystemDictionaryShared::write_to_archive(bool is_static_archive) {
--- 1951,1965 ----
    _dumptime_lambda_proxy_class_dictionary->iterate(&copy);
    writer.dump(dictionary, "lambda proxy class dictionary");
  }
  
  void SystemDictionaryShared::write_dictionary(RunTimeSharedDictionary* dictionary,
!                                               bool is_builtin) {
    CompactHashtableStats stats;
    dictionary->reset();
    CompactHashtableWriter writer(_dumptime_table->count_of(is_builtin), &stats);
!   CopySharedClassInfoToArchive copy(&writer, is_builtin);
    _dumptime_table->iterate(&copy);
    writer.dump(dictionary, is_builtin ? "builtin dictionary" : "unregistered dictionary");
  }
  
  void SystemDictionaryShared::write_to_archive(bool is_static_archive) {