Skip to content

Commit cbf6894

Browse files
coleenpcoleenp
committedJul 24, 2020
8250516: [BACKOUT] Move mirror oops from Universe into OopStorage
Reviewed-by: dholmes, tschatzl
·
JEP-429-branchpoint
1 parent 77c4adb commit cbf6894

File tree

4 files changed

+156
-93
lines changed

4 files changed

+156
-93
lines changed
 

‎src/hotspot/share/classfile/javaClasses.cpp

+25-5
Original file line numberDiff line numberDiff line change
@@ -1121,9 +1121,8 @@ void java_lang_Class::archive_basic_type_mirrors(TRAPS) {
11211121
assert(HeapShared::is_heap_object_archiving_allowed(),
11221122
"HeapShared::is_heap_object_archiving_allowed() must be true");
11231123

1124-
for (int t = T_BOOLEAN; t < T_VOID+1; t++) {
1125-
BasicType bt = (BasicType)t;
1126-
oop m = Universe::_mirrors[t].resolve();
1124+
for (int t = 0; t <= T_VOID; t++) {
1125+
oop m = Universe::_mirrors[t];
11271126
if (m != NULL) {
11281127
// Update the field at _array_klass_offset to point to the relocated array klass.
11291128
oop archived_m = HeapShared::archive_heap_object(m, THREAD);
@@ -1143,12 +1142,33 @@ void java_lang_Class::archive_basic_type_mirrors(TRAPS) {
11431142

11441143
log_trace(cds, heap, mirror)(
11451144
"Archived %s mirror object from " PTR_FORMAT " ==> " PTR_FORMAT,
1146-
type2name(bt), p2i(m), p2i(archived_m));
1145+
type2name((BasicType)t), p2i(Universe::_mirrors[t]), p2i(archived_m));
11471146

1148-
Universe::replace_mirror(bt, archived_m);
1147+
Universe::_mirrors[t] = archived_m;
11491148
}
11501149
}
1150+
1151+
assert(Universe::_mirrors[T_INT] != NULL &&
1152+
Universe::_mirrors[T_FLOAT] != NULL &&
1153+
Universe::_mirrors[T_DOUBLE] != NULL &&
1154+
Universe::_mirrors[T_BYTE] != NULL &&
1155+
Universe::_mirrors[T_BOOLEAN] != NULL &&
1156+
Universe::_mirrors[T_CHAR] != NULL &&
1157+
Universe::_mirrors[T_LONG] != NULL &&
1158+
Universe::_mirrors[T_SHORT] != NULL &&
1159+
Universe::_mirrors[T_VOID] != NULL, "sanity");
1160+
1161+
Universe::set_int_mirror(Universe::_mirrors[T_INT]);
1162+
Universe::set_float_mirror(Universe::_mirrors[T_FLOAT]);
1163+
Universe::set_double_mirror(Universe::_mirrors[T_DOUBLE]);
1164+
Universe::set_byte_mirror(Universe::_mirrors[T_BYTE]);
1165+
Universe::set_bool_mirror(Universe::_mirrors[T_BOOLEAN]);
1166+
Universe::set_char_mirror(Universe::_mirrors[T_CHAR]);
1167+
Universe::set_long_mirror(Universe::_mirrors[T_LONG]);
1168+
Universe::set_short_mirror(Universe::_mirrors[T_SHORT]);
1169+
Universe::set_void_mirror(Universe::_mirrors[T_VOID]);
11511170
}
1171+
11521172
//
11531173
// After the mirror object is successfully archived, the archived
11541174
// klass is set with _has_archived_raw_mirror flag.

‎src/hotspot/share/memory/metaspaceShared.cpp

+15-2
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,19 @@ static void remove_java_mirror_in_classes() {
714714
}
715715
}
716716

717+
static void clear_basic_type_mirrors() {
718+
assert(!HeapShared::is_heap_object_archiving_allowed(), "Sanity");
719+
Universe::set_int_mirror(NULL);
720+
Universe::set_float_mirror(NULL);
721+
Universe::set_double_mirror(NULL);
722+
Universe::set_byte_mirror(NULL);
723+
Universe::set_bool_mirror(NULL);
724+
Universe::set_char_mirror(NULL);
725+
Universe::set_long_mirror(NULL);
726+
Universe::set_short_mirror(NULL);
727+
Universe::set_void_mirror(NULL);
728+
}
729+
717730
static void rewrite_nofast_bytecode(const methodHandle& method) {
718731
BytecodeStream bcs(method);
719732
while (!bcs.is_last_bytecode()) {
@@ -1527,7 +1540,7 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables() {
15271540

15281541
log_info(cds)("Removing java_mirror ... ");
15291542
if (!HeapShared::is_heap_object_archiving_allowed()) {
1530-
Universe::clear_basic_type_mirrors();
1543+
clear_basic_type_mirrors();
15311544
}
15321545
remove_java_mirror_in_classes();
15331546
log_info(cds)("done. ");
@@ -2079,7 +2092,7 @@ void ReadClosure::do_tag(int tag) {
20792092
void ReadClosure::do_oop(oop *p) {
20802093
narrowOop o = (narrowOop)nextPtr();
20812094
if (o == 0 || !HeapShared::open_archive_heap_region_mapped()) {
2082-
*p = NULL;
2095+
p = NULL;
20832096
} else {
20842097
assert(HeapShared::is_heap_object_archiving_allowed(),
20852098
"Archived heap object is not allowed");

‎src/hotspot/share/memory/universe.cpp

+76-67
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,25 @@
8888
#include "utilities/ostream.hpp"
8989
#include "utilities/preserveException.hpp"
9090

91+
#define PRIMITIVE_MIRRORS_DO(func) \
92+
func(_int_mirror) \
93+
func(_float_mirror) \
94+
func(_double_mirror) \
95+
func(_byte_mirror) \
96+
func(_bool_mirror) \
97+
func(_char_mirror) \
98+
func(_long_mirror) \
99+
func(_short_mirror) \
100+
func(_void_mirror)
101+
102+
#define DEFINE_PRIMITIVE_MIRROR(m) \
103+
oop Universe::m = NULL;
104+
91105
// Known objects
106+
PRIMITIVE_MIRRORS_DO(DEFINE_PRIMITIVE_MIRROR)
92107
Klass* Universe::_typeArrayKlassObjs[T_LONG+1] = { NULL /*, NULL...*/ };
93108
Klass* Universe::_objectArrayKlassObj = NULL;
94-
OopHandle Universe::_mirrors[T_VOID+1];
109+
oop Universe::_mirrors[T_VOID+1] = { NULL /*, NULL...*/ };
95110

96111
OopHandle Universe::_main_thread_group;
97112
OopHandle Universe::_system_thread_group;
@@ -182,35 +197,6 @@ oop Universe::virtual_machine_error_instance() { return _virtual_machine_erro
182197

183198
oop Universe::the_null_sentinel() { return _the_null_sentinel.resolve(); }
184199

185-
oop Universe::int_mirror() { return check_mirror(_mirrors[T_INT].resolve()); }
186-
oop Universe::float_mirror() { return check_mirror(_mirrors[T_FLOAT].resolve()); }
187-
oop Universe::double_mirror() { return check_mirror(_mirrors[T_DOUBLE].resolve()); }
188-
oop Universe::byte_mirror() { return check_mirror(_mirrors[T_BYTE].resolve()); }
189-
oop Universe::bool_mirror() { return check_mirror(_mirrors[T_BOOLEAN].resolve()); }
190-
oop Universe::char_mirror() { return check_mirror(_mirrors[T_CHAR].resolve()); }
191-
oop Universe::long_mirror() { return check_mirror(_mirrors[T_LONG].resolve()); }
192-
oop Universe::short_mirror() { return check_mirror(_mirrors[T_SHORT].resolve()); }
193-
oop Universe::void_mirror() { return check_mirror(_mirrors[T_VOID].resolve()); }
194-
195-
oop Universe::java_mirror(BasicType t) {
196-
assert((uint)t < T_VOID+1, "range check");
197-
return check_mirror(_mirrors[t].resolve());
198-
}
199-
200-
// Used by CDS dumping
201-
void Universe::replace_mirror(BasicType t, oop new_mirror) {
202-
Universe::_mirrors[t].replace(new_mirror);
203-
}
204-
205-
// Not sure why CDS has to do this
206-
void Universe::clear_basic_type_mirrors() {
207-
for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
208-
if (!is_reference_type((BasicType)i)) {
209-
Universe::_mirrors[i].replace(NULL);
210-
}
211-
}
212-
}
213-
214200
void Universe::basic_type_classes_do(void f(Klass*)) {
215201
for (int i = T_BOOLEAN; i < T_LONG+1; i++) {
216202
f(_typeArrayKlassObjs[i]);
@@ -223,7 +209,16 @@ void Universe::basic_type_classes_do(KlassClosure *closure) {
223209
}
224210
}
225211

212+
#define DO_PRIMITIVE_MIRROR(m) \
213+
f->do_oop((oop*) &m);
214+
226215
void Universe::oops_do(OopClosure* f) {
216+
PRIMITIVE_MIRRORS_DO(DO_PRIMITIVE_MIRROR);
217+
218+
for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
219+
f->do_oop(&_mirrors[i]);
220+
}
221+
assert(_mirrors[0] == NULL && _mirrors[T_BOOLEAN - 1] == NULL, "checking");
227222

228223
f->do_oop(&_reference_pending_list);
229224
ThreadsSMRSupport::exiting_threads_oops_do(f);
@@ -253,33 +248,29 @@ void Universe::metaspace_pointers_do(MetaspaceClosure* it) {
253248
_do_stack_walk_cache->metaspace_pointers_do(it);
254249
}
255250

251+
#define ASSERT_MIRROR_NULL(m) \
252+
assert(m == NULL, "archived mirrors should be NULL");
253+
254+
#define SERIALIZE_MIRROR(m) \
255+
f->do_oop(&m); \
256+
if (m != NULL) { java_lang_Class::update_archived_primitive_mirror_native_pointers(m); }
257+
256258
// Serialize metadata and pointers to primitive type mirrors in and out of CDS archive
257259
void Universe::serialize(SerializeClosure* f) {
258260

259-
#if INCLUDE_CDS_JAVA_HEAP
260-
{
261-
oop mirror_oop;
262-
for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
263-
if (f->reading()) {
264-
f->do_oop(&mirror_oop); // read from archive
265-
assert(oopDesc::is_oop_or_null(mirror_oop), "is oop");
266-
_mirrors[i] = OopHandle(vm_global(), mirror_oop);
267-
} else {
268-
mirror_oop = _mirrors[i].resolve();
269-
f->do_oop(&mirror_oop); // write to archive
270-
}
271-
if (mirror_oop != NULL) { // may be null if archived heap is disabled
272-
java_lang_Class::update_archived_primitive_mirror_native_pointers(mirror_oop);
273-
}
274-
}
275-
}
276-
#endif
277-
278261
for (int i = 0; i < T_LONG+1; i++) {
279262
f->do_ptr((void**)&_typeArrayKlassObjs[i]);
280263
}
281264

282265
f->do_ptr((void**)&_objectArrayKlassObj);
266+
267+
#if INCLUDE_CDS_JAVA_HEAP
268+
DEBUG_ONLY(if (DumpSharedSpaces && !HeapShared::is_heap_object_archiving_allowed()) {
269+
PRIMITIVE_MIRRORS_DO(ASSERT_MIRROR_NULL);
270+
});
271+
PRIMITIVE_MIRRORS_DO(SERIALIZE_MIRROR);
272+
#endif
273+
283274
f->do_ptr((void**)&_the_array_interfaces_array);
284275
f->do_ptr((void**)&_the_empty_int_array);
285276
f->do_ptr((void**)&_the_empty_short_array);
@@ -293,7 +284,6 @@ void Universe::serialize(SerializeClosure* f) {
293284
_do_stack_walk_cache->serialize(f);
294285
}
295286

296-
297287
void Universe::check_alignment(uintx size, uintx alignment, const char* name) {
298288
if (size < alignment || size % alignment != 0) {
299289
vm_exit_during_initialization(
@@ -445,32 +435,51 @@ void Universe::genesis(TRAPS) {
445435
#endif
446436
}
447437

438+
#define ASSERT_MIRROR_NOT_NULL(m) \
439+
assert(m != NULL, "archived mirrors should not be NULL");
440+
448441
void Universe::initialize_basic_type_mirrors(TRAPS) {
449442
#if INCLUDE_CDS_JAVA_HEAP
450443
if (UseSharedSpaces &&
451444
HeapShared::open_archive_heap_region_mapped() &&
452-
_mirrors[T_INT].resolve() != NULL) {
445+
_int_mirror != NULL) {
453446
assert(HeapShared::is_heap_object_archiving_allowed(), "Sanity");
454-
455-
// check that all mirrors are mapped also
456-
for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
457-
if (!is_reference_type((BasicType)i)) {
458-
oop m = _mirrors[i].resolve();
459-
assert(m != NULL, "archived mirrors should not be NULL");
460-
}
461-
}
447+
PRIMITIVE_MIRRORS_DO(ASSERT_MIRROR_NOT_NULL);
462448
} else
463-
// _mirror[T_INT} could be NULL if archived heap is not mapped.
449+
// _int_mirror could be NULL if archived heap is not mapped.
464450
#endif
465451
{
466-
for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
467-
BasicType bt = (BasicType)i;
468-
if (!is_reference_type(bt)) {
469-
oop m = java_lang_Class::create_basic_type_mirror(type2name(bt), bt, CHECK);
470-
_mirrors[i] = OopHandle(vm_global(), m);
471-
}
472-
}
452+
_int_mirror =
453+
java_lang_Class::create_basic_type_mirror("int", T_INT, CHECK);
454+
_float_mirror =
455+
java_lang_Class::create_basic_type_mirror("float", T_FLOAT, CHECK);
456+
_double_mirror =
457+
java_lang_Class::create_basic_type_mirror("double", T_DOUBLE, CHECK);
458+
_byte_mirror =
459+
java_lang_Class::create_basic_type_mirror("byte", T_BYTE, CHECK);
460+
_bool_mirror =
461+
java_lang_Class::create_basic_type_mirror("boolean",T_BOOLEAN, CHECK);
462+
_char_mirror =
463+
java_lang_Class::create_basic_type_mirror("char", T_CHAR, CHECK);
464+
_long_mirror =
465+
java_lang_Class::create_basic_type_mirror("long", T_LONG, CHECK);
466+
_short_mirror =
467+
java_lang_Class::create_basic_type_mirror("short", T_SHORT, CHECK);
468+
_void_mirror =
469+
java_lang_Class::create_basic_type_mirror("void", T_VOID, CHECK);
473470
}
471+
472+
_mirrors[T_INT] = _int_mirror;
473+
_mirrors[T_FLOAT] = _float_mirror;
474+
_mirrors[T_DOUBLE] = _double_mirror;
475+
_mirrors[T_BYTE] = _byte_mirror;
476+
_mirrors[T_BOOLEAN] = _bool_mirror;
477+
_mirrors[T_CHAR] = _char_mirror;
478+
_mirrors[T_LONG] = _long_mirror;
479+
_mirrors[T_SHORT] = _short_mirror;
480+
_mirrors[T_VOID] = _void_mirror;
481+
//_mirrors[T_OBJECT] = _object_klass->java_mirror();
482+
//_mirrors[T_ARRAY] = _object_klass->java_mirror();
474483
}
475484

476485
void Universe::fixup_mirrors(TRAPS) {

‎src/hotspot/share/memory/universe.hpp

+40-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,18 @@ class Universe: AllStatic {
9595
static Klass* _objectArrayKlassObj;
9696

9797
// Known objects in the VM
98+
99+
// Primitive objects
100+
static oop _int_mirror;
101+
static oop _float_mirror;
102+
static oop _double_mirror;
103+
static oop _byte_mirror;
104+
static oop _bool_mirror;
105+
static oop _char_mirror;
106+
static oop _long_mirror;
107+
static oop _short_mirror;
108+
static oop _void_mirror;
109+
98110
static OopHandle _main_thread_group; // Reference to the main thread group object
99111
static OopHandle _system_thread_group; // Reference to the system thread group object
100112

@@ -220,24 +232,33 @@ class Universe: AllStatic {
220232
}
221233

222234
// Known objects in the VM
223-
static oop int_mirror();
224-
static oop float_mirror();
225-
static oop double_mirror();
226-
static oop byte_mirror();
227-
static oop bool_mirror();
228-
static oop char_mirror();
229-
static oop long_mirror();
230-
static oop short_mirror();
231-
static oop void_mirror();
232-
233-
// Table of primitive type mirrors, excluding T_OBJECT and T_ARRAY
234-
// but including T_VOID, hence the index including T_VOID
235-
static OopHandle _mirrors[T_VOID+1];
236-
237-
static oop java_mirror(BasicType t);
238-
static void replace_mirror(BasicType t, oop obj);
239-
static void clear_basic_type_mirrors();
240-
235+
static oop int_mirror() { return check_mirror(_int_mirror); }
236+
static oop float_mirror() { return check_mirror(_float_mirror); }
237+
static oop double_mirror() { return check_mirror(_double_mirror); }
238+
static oop byte_mirror() { return check_mirror(_byte_mirror); }
239+
static oop bool_mirror() { return check_mirror(_bool_mirror); }
240+
static oop char_mirror() { return check_mirror(_char_mirror); }
241+
static oop long_mirror() { return check_mirror(_long_mirror); }
242+
static oop short_mirror() { return check_mirror(_short_mirror); }
243+
static oop void_mirror() { return check_mirror(_void_mirror); }
244+
245+
static void set_int_mirror(oop m) { _int_mirror = m; }
246+
static void set_float_mirror(oop m) { _float_mirror = m; }
247+
static void set_double_mirror(oop m) { _double_mirror = m; }
248+
static void set_byte_mirror(oop m) { _byte_mirror = m; }
249+
static void set_bool_mirror(oop m) { _bool_mirror = m; }
250+
static void set_char_mirror(oop m) { _char_mirror = m; }
251+
static void set_long_mirror(oop m) { _long_mirror = m; }
252+
static void set_short_mirror(oop m) { _short_mirror = m; }
253+
static void set_void_mirror(oop m) { _void_mirror = m; }
254+
255+
// table of same
256+
static oop _mirrors[T_VOID+1];
257+
258+
static oop java_mirror(BasicType t) {
259+
assert((uint)t < T_VOID+1, "range check");
260+
return check_mirror(_mirrors[t]);
261+
}
241262
static oop main_thread_group();
242263
static void set_main_thread_group(oop group);
243264

0 commit comments

Comments
 (0)
Please sign in to comment.