diff -r 00a98f0aa1b3 -r e47b459b315c src/hotspot/share/memory/dynamicArchive.cpp --- a/src/hotspot/share/memory/dynamicArchive.cpp Mon Sep 23 19:54:37 2019 -0700 +++ b/src/hotspot/share/memory/dynamicArchive.cpp Mon Sep 23 19:55:26 2019 -0700 @@ -470,7 +470,7 @@ void sort_methods(InstanceKlass* ik) const; void set_symbols_permanent(); void relocate_buffer_to_target(); - void write_archive(char* read_only_tables_start); + void write_archive(char* serialized_data_start); void write_regions(FileMapInfo* dynamic_info); void init_first_dump_space(address reserved_bottom) { @@ -596,7 +596,7 @@ verify_estimate_size(_estimated_metsapceobj_bytes, "MetaspaceObjs"); - char* read_only_tables_start; + char* serialized_data_start; { set_symbols_permanent(); @@ -609,7 +609,7 @@ SymbolTable::write_to_archive(false); SystemDictionaryShared::write_to_archive(false); - read_only_tables_start = ro_space->top(); + serialized_data_start = ro_space->top(); WriteClosure wc(ro_space); SymbolTable::serialize_shared_table_header(&wc, false); SystemDictionaryShared::serialize_dictionary_headers(&wc, false); @@ -635,7 +635,7 @@ relocate_buffer_to_target(); } - write_archive(read_only_tables_start); + write_archive(serialized_data_start); assert(_num_dump_regions_used == _total_dump_regions, "must be"); verify_universe("After CDS dynamic dump"); @@ -927,11 +927,11 @@ /*read_only=*/false,/*allow_exec=*/true); } -void DynamicArchiveBuilder::write_archive(char* read_only_tables_start) { +void DynamicArchiveBuilder::write_archive(char* serialized_data_start) { int num_klasses = _klasses->length(); int num_symbols = _symbols->length(); - _header->set_read_only_tables_start(to_target(read_only_tables_start)); + _header->set_serialized_data_start(to_target(serialized_data_start)); FileMapInfo* dynamic_info = FileMapInfo::dynamic_info(); assert(dynamic_info != NULL, "Sanity"); @@ -1102,7 +1102,7 @@ return NULL; } - intptr_t* buffer = (intptr_t*)_dynamic_header->read_only_tables_start(); + intptr_t* buffer = (intptr_t*)_dynamic_header->serialized_data_start(); ReadClosure rc(&buffer); SymbolTable::serialize_shared_table_header(&rc, false); SystemDictionaryShared::serialize_dictionary_headers(&rc, false);