< prev index next >

src/share/vm/memory/filemap.cpp

Print this page

        

*** 166,175 **** --- 166,176 ---- void FileMapInfo::FileMapHeader::populate(FileMapInfo* mapinfo, size_t alignment) { _magic = 0xf00baba2; _version = _current_version; _alignment = alignment; _obj_alignment = ObjectAlignmentInBytes; + _compact_strings = CompactStrings; _narrow_oop_mode = Universe::narrow_oop_mode(); _narrow_oop_shift = Universe::narrow_oop_shift(); _max_heap_size = MaxHeapSize; _narrow_klass_base = Universe::narrow_klass_base(); _narrow_klass_shift = Universe::narrow_klass_shift();
*** 898,907 **** --- 899,915 ---- FileMapInfo::fail_continue("The shared archive file's ObjectAlignmentInBytes of %d" " does not equal the current ObjectAlignmentInBytes of " INTX_FORMAT ".", _obj_alignment, ObjectAlignmentInBytes); return false; } + if (_compact_strings != CompactStrings) { + FileMapInfo::fail_continue("The shared archive file's CompactStrings setting (%s)" + " does not equal the current CompactStrings setting (%s).", + _compact_strings ? "enabled" : "disabled", + CompactStrings ? "enabled" : "disabled"); + return false; + } return true; } bool FileMapInfo::validate_header() {
< prev index next >