equal
deleted
inserted
replaced
37 #include "gc/shared/gcConfig.hpp" |
37 #include "gc/shared/gcConfig.hpp" |
38 #include "gc/shared/gcTraceTime.inline.hpp" |
38 #include "gc/shared/gcTraceTime.inline.hpp" |
39 #include "interpreter/interpreter.hpp" |
39 #include "interpreter/interpreter.hpp" |
40 #include "logging/log.hpp" |
40 #include "logging/log.hpp" |
41 #include "logging/logStream.hpp" |
41 #include "logging/logStream.hpp" |
|
42 #include "memory/heapShared.hpp" |
42 #include "memory/filemap.hpp" |
43 #include "memory/filemap.hpp" |
43 #include "memory/metadataFactory.hpp" |
44 #include "memory/metadataFactory.hpp" |
44 #include "memory/metaspaceClosure.hpp" |
45 #include "memory/metaspaceClosure.hpp" |
45 #include "memory/metaspaceCounters.hpp" |
46 #include "memory/metaspaceCounters.hpp" |
46 #include "memory/metaspaceShared.hpp" |
47 #include "memory/metaspaceShared.hpp" |
240 f->do_ptr((void**)&_typeArrayKlassObjs[i]); |
241 f->do_ptr((void**)&_typeArrayKlassObjs[i]); |
241 } |
242 } |
242 |
243 |
243 f->do_ptr((void**)&_objectArrayKlassObj); |
244 f->do_ptr((void**)&_objectArrayKlassObj); |
244 #if INCLUDE_CDS_JAVA_HEAP |
245 #if INCLUDE_CDS_JAVA_HEAP |
245 // The mirrors are NULL if MetaspaceShared::is_heap_object_archiving_allowed |
246 #ifdef ASSERT |
246 // is false. |
247 if (DumpSharedSpaces && !HeapShared::is_heap_object_archiving_allowed()) { |
|
248 assert(_int_mirror == NULL && _float_mirror == NULL && |
|
249 _double_mirror == NULL && _byte_mirror == NULL && |
|
250 _bool_mirror == NULL && _char_mirror == NULL && |
|
251 _long_mirror == NULL && _short_mirror == NULL && |
|
252 _void_mirror == NULL, "mirrors should be NULL"); |
|
253 } |
|
254 #endif |
247 f->do_oop(&_int_mirror); |
255 f->do_oop(&_int_mirror); |
248 f->do_oop(&_float_mirror); |
256 f->do_oop(&_float_mirror); |
249 f->do_oop(&_double_mirror); |
257 f->do_oop(&_double_mirror); |
250 f->do_oop(&_byte_mirror); |
258 f->do_oop(&_byte_mirror); |
251 f->do_oop(&_bool_mirror); |
259 f->do_oop(&_bool_mirror); |
420 } |
428 } |
421 |
429 |
422 void Universe::initialize_basic_type_mirrors(TRAPS) { |
430 void Universe::initialize_basic_type_mirrors(TRAPS) { |
423 #if INCLUDE_CDS_JAVA_HEAP |
431 #if INCLUDE_CDS_JAVA_HEAP |
424 if (UseSharedSpaces && |
432 if (UseSharedSpaces && |
425 MetaspaceShared::open_archive_heap_region_mapped() && |
433 HeapShared::open_archive_heap_region_mapped() && |
426 _int_mirror != NULL) { |
434 _int_mirror != NULL) { |
427 assert(MetaspaceShared::is_heap_object_archiving_allowed(), "Sanity"); |
435 assert(HeapShared::is_heap_object_archiving_allowed(), "Sanity"); |
428 assert(_float_mirror != NULL && _double_mirror != NULL && |
436 assert(_float_mirror != NULL && _double_mirror != NULL && |
429 _byte_mirror != NULL && _byte_mirror != NULL && |
437 _byte_mirror != NULL && _byte_mirror != NULL && |
430 _bool_mirror != NULL && _char_mirror != NULL && |
438 _bool_mirror != NULL && _char_mirror != NULL && |
431 _long_mirror != NULL && _short_mirror != NULL && |
439 _long_mirror != NULL && _short_mirror != NULL && |
432 _void_mirror != NULL, "Sanity"); |
440 _void_mirror != NULL, "Sanity"); |