50 #include "interpreter/interpreter.hpp" |
50 #include "interpreter/interpreter.hpp" |
51 #include "jfr/jfrEvents.hpp" |
51 #include "jfr/jfrEvents.hpp" |
52 #include "logging/log.hpp" |
52 #include "logging/log.hpp" |
53 #include "logging/logStream.hpp" |
53 #include "logging/logStream.hpp" |
54 #include "memory/filemap.hpp" |
54 #include "memory/filemap.hpp" |
|
55 #include "memory/heapShared.hpp" |
55 #include "memory/metaspaceClosure.hpp" |
56 #include "memory/metaspaceClosure.hpp" |
56 #include "memory/oopFactory.hpp" |
57 #include "memory/oopFactory.hpp" |
57 #include "memory/resourceArea.hpp" |
58 #include "memory/resourceArea.hpp" |
58 #include "oops/access.inline.hpp" |
59 #include "oops/access.inline.hpp" |
59 #include "oops/instanceKlass.hpp" |
60 #include "oops/instanceKlass.hpp" |
2035 // before the archived java objects are accessed by functions |
2036 // before the archived java objects are accessed by functions |
2036 // such as java_lang_Class::restore_archived_mirror and |
2037 // such as java_lang_Class::restore_archived_mirror and |
2037 // ConstantPool::restore_unshareable_info (restores the archived |
2038 // ConstantPool::restore_unshareable_info (restores the archived |
2038 // resolved_references array object). |
2039 // resolved_references array object). |
2039 // |
2040 // |
2040 // MetaspaceShared::fixup_mapped_heap_regions() fills the empty |
2041 // HeapShared::fixup_mapped_heap_regions() fills the empty |
2041 // spaces in the archived heap regions and may use |
2042 // spaces in the archived heap regions and may use |
2042 // SystemDictionary::Object_klass(), so we can do this only after |
2043 // SystemDictionary::Object_klass(), so we can do this only after |
2043 // Object_klass is resolved. See the above resolve_wk_klasses_through() |
2044 // Object_klass is resolved. See the above resolve_wk_klasses_through() |
2044 // call. No mirror objects are accessed/restored in the above call. |
2045 // call. No mirror objects are accessed/restored in the above call. |
2045 // Mirrors are restored after java.lang.Class is loaded. |
2046 // Mirrors are restored after java.lang.Class is loaded. |
2046 MetaspaceShared::fixup_mapped_heap_regions(); |
2047 HeapShared::fixup_mapped_heap_regions(); |
2047 |
2048 |
2048 // Initialize the constant pool for the Object_class |
2049 // Initialize the constant pool for the Object_class |
2049 Object_klass()->constants()->restore_unshareable_info(CHECK); |
2050 Object_klass()->constants()->restore_unshareable_info(CHECK); |
2050 resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); |
2051 resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); |
2051 } else |
2052 } else |