archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8210523: runtime/appcds/cacheObject/DifferentHeapSizes.java crash

Browse source 
Reviewed-by: jiangli, ccheung
This commit is contained in:
Ioi Lam 2018-09-12 17:45:22 -07:00
parent cf26c4cc5c
commit 4e74846da8
10 changed files with 65 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/memory/metaspaceShared.cpp
View file

@ -1944,7 +1944,7 @@ oop MetaspaceShared::materialize_archived_object(narrowOop v) {
assert(archive_heap_region_fixed(),
"must be called after archive heap regions are fixed");
if (!CompressedOops::is_null(v)) {
oop obj = HeapShared::decode_with_archived_oop_encoding_mode(v);
oop obj = HeapShared::decode_from_archive(v);
return G1CollectedHeap::heap()->materialize_archived_object(obj);
}
return NULL;
@ -2021,7 +2021,7 @@ public:
"Archived heap object is not allowed");
assert(MetaspaceShared::open_archive_heap_region_mapped(),
"Open archive heap region is not mapped");
*p = HeapShared::decode_with_archived_oop_encoding_mode(o);
*p = HeapShared::decode_from_archive(o);
}
}