--- a/src/hotspot/share/classfile/systemDictionary.cpp Tue Nov 13 21:43:10 2018 -0500
+++ b/src/hotspot/share/classfile/systemDictionary.cpp Wed Nov 07 19:40:27 2018 -0800
@@ -96,7 +96,6 @@
#endif
PlaceholderTable* SystemDictionary::_placeholders = NULL;
-Dictionary* SystemDictionary::_shared_dictionary = NULL;
LoaderConstraintTable* SystemDictionary::_loader_constraints = NULL;
ResolutionErrorTable* SystemDictionary::_resolution_errors = NULL;
SymbolPropertyTable* SystemDictionary::_invoke_method_table = NULL;
@@ -355,7 +354,7 @@
assert(!FieldType::is_array(super_name), "invalid super class name");
#if INCLUDE_CDS
if (DumpSharedSpaces) {
- // Special processing for CDS dump time.
+ // Special processing for handling UNREGISTERED shared classes.
InstanceKlass* k = SystemDictionaryShared::dump_time_resolve_super_or_fail(child_name,
super_name, class_loader, protection_domain, is_superclass, CHECK_NULL);
if (k) {
@@ -1163,39 +1162,11 @@
}
#if INCLUDE_CDS
-void SystemDictionary::set_shared_dictionary(HashtableBucket<mtClass>* t, int length,
- int number_of_entries) {
- assert(!DumpSharedSpaces, "Should not be called with DumpSharedSpaces");
- assert(length == _shared_dictionary_size * sizeof(HashtableBucket<mtClass>),
- "bad shared dictionary size.");
- _shared_dictionary = new Dictionary(ClassLoaderData::the_null_class_loader_data(),
- _shared_dictionary_size, t, number_of_entries,
- false /* explicitly set _resizable to false */);
-}
-
-
-// If there is a shared dictionary, then find the entry for the
-// given shared system class, if any.
-
-InstanceKlass* SystemDictionary::find_shared_class(Symbol* class_name) {
- if (shared_dictionary() != NULL) {
- unsigned int d_hash = shared_dictionary()->compute_hash(class_name);
- int d_index = shared_dictionary()->hash_to_index(d_hash);
-
- return shared_dictionary()->find_shared_class(d_index, d_hash, class_name);
- } else {
- return NULL;
- }
-}
-
-
-// Load a class for boot loader from the shared spaces (found through
-// the shared system dictionary). Force the super class and all interfaces
-// to be loaded.
+// Load a class for boot loader from the shared spaces. This also
+// forces the super class and all interfaces to be loaded.
InstanceKlass* SystemDictionary::load_shared_boot_class(Symbol* class_name,
TRAPS) {
- InstanceKlass* ik = find_shared_class(class_name);
- // Make sure we only return the boot class.
+ InstanceKlass* ik = SystemDictionaryShared::find_builtin_class(class_name);
if (ik != NULL && ik->is_shared_boot_class()) {
return load_shared_class(ik, Handle(), Handle(), THREAD);
}
@@ -1410,18 +1381,6 @@
}
return ik;
}
-
-void SystemDictionary::clear_invoke_method_table() {
- SymbolPropertyEntry* spe = NULL;
- for (int index = 0; index < _invoke_method_table->table_size(); index++) {
- SymbolPropertyEntry* p = _invoke_method_table->bucket(index);
- while (p != NULL) {
- spe = p;
- p = p->next();
- _invoke_method_table->free_entry(spe);
- }
- }
-}
#endif // INCLUDE_CDS
InstanceKlass* SystemDictionary::load_instance_class(Symbol* class_name, Handle class_loader, TRAPS) {
@@ -1900,11 +1859,6 @@
invoke_method_table()->oops_do(f);
}
-// CDS: scan and relocate all classes in the system dictionary.
-void SystemDictionary::classes_do(MetaspaceClosure* it) {
- ClassLoaderData::the_null_class_loader_data()->dictionary()->classes_do(it);
-}
-
// CDS: scan and relocate all classes referenced by _well_known_klasses[].
void SystemDictionary::well_known_klasses_do(MetaspaceClosure* it) {
for (int id = FIRST_WKID; id < WKID_LIMIT; id++) {
@@ -1920,22 +1874,6 @@
invoke_method_table()->methods_do(f);
}
-class RemoveClassesClosure : public CLDClosure {
- public:
- void do_cld(ClassLoaderData* cld) {
- if (cld->is_system_class_loader_data() || cld->is_platform_class_loader_data()) {
- cld->dictionary()->remove_classes_in_error_state();
- }
- }
-};
-
-void SystemDictionary::remove_classes_in_error_state() {
- ClassLoaderData::the_null_class_loader_data()->dictionary()->remove_classes_in_error_state();
- RemoveClassesClosure rcc;
- MutexLocker ml(ClassLoaderDataGraph_lock);
- ClassLoaderDataGraph::cld_do(&rcc);
-}
-
// ----------------------------------------------------------------------------
// Initialization
@@ -2038,6 +1976,7 @@
HeapShared::fixup_mapped_heap_regions();
// Initialize the constant pool for the Object_class
+ assert(Object_klass()->is_shared(), "must be");
Object_klass()->constants()->restore_unshareable_info(CHECK);
resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
} else
@@ -2921,40 +2860,10 @@
return _pd_cache_table->get(protection_domain);
}
-#if INCLUDE_CDS
-void SystemDictionary::reorder_dictionary_for_sharing() {
- ClassLoaderData::the_null_class_loader_data()->dictionary()->reorder_dictionary_for_sharing();
-}
-#endif
-
-size_t SystemDictionary::count_bytes_for_buckets() {
- return ClassLoaderData::the_null_class_loader_data()->dictionary()->count_bytes_for_buckets();
-}
-
-size_t SystemDictionary::count_bytes_for_table() {
- return ClassLoaderData::the_null_class_loader_data()->dictionary()->count_bytes_for_table();
-}
-
-void SystemDictionary::copy_buckets(char* top, char* end) {
- ClassLoaderData::the_null_class_loader_data()->dictionary()->copy_buckets(top, end);
-}
-
-void SystemDictionary::copy_table(char* top, char* end) {
- ClassLoaderData::the_null_class_loader_data()->dictionary()->copy_table(top, end);
-}
-
// ----------------------------------------------------------------------------
-void SystemDictionary::print_shared(outputStream *st) {
- shared_dictionary()->print_on(st);
-}
void SystemDictionary::print_on(outputStream *st) {
- if (shared_dictionary() != NULL) {
- st->print_cr("Shared Dictionary");
- shared_dictionary()->print_on(st);
- st->cr();
- }
-
+ CDS_ONLY(SystemDictionaryShared::print_on(st));
GCMutexLocker mu(SystemDictionary_lock);
ClassLoaderDataGraph::print_dictionary(st);
@@ -2996,9 +2905,7 @@
if (verbose) {
print_on(st);
} else {
- if (shared_dictionary() != NULL) {
- shared_dictionary()->print_table_statistics(st, "Shared Dictionary");
- }
+ CDS_ONLY(SystemDictionaryShared::print_table_statistics(st));
ClassLoaderDataGraph::print_dictionary_statistics(st);
placeholders()->print_table_statistics(st, "Placeholder Table");
constraints()->print_table_statistics(st, "LoaderConstraints Table");
@@ -3031,60 +2938,6 @@
}
}
-class CombineDictionariesClosure : public CLDClosure {
- private:
- Dictionary* _master_dictionary;
- public:
- CombineDictionariesClosure(Dictionary* master_dictionary) :
- _master_dictionary(master_dictionary) {}
- void do_cld(ClassLoaderData* cld) {
- ResourceMark rm;
- if (cld->is_unsafe_anonymous()) {
- return;
- }
- if (cld->is_system_class_loader_data() || cld->is_platform_class_loader_data()) {
- for (int i = 0; i < cld->dictionary()->table_size(); ++i) {
- Dictionary* curr_dictionary = cld->dictionary();
- DictionaryEntry* p = curr_dictionary->bucket(i);
- while (p != NULL) {
- Symbol* name = p->instance_klass()->name();
- unsigned int d_hash = _master_dictionary->compute_hash(name);
- int d_index = _master_dictionary->hash_to_index(d_hash);
- DictionaryEntry* next = p->next();
- if (p->literal()->class_loader_data() != cld) {
- // This is an initiating class loader entry; don't use it
- log_trace(cds)("Skipping initiating cl entry: %s", name->as_C_string());
- curr_dictionary->free_entry(p);
- } else {
- log_trace(cds)("Moved to boot dictionary: %s", name->as_C_string());
- curr_dictionary->unlink_entry(p);
- p->set_pd_set(NULL); // pd_set is runtime only information and will be reconstructed.
- _master_dictionary->add_entry(d_index, p);
- }
- p = next;
- }
- *curr_dictionary->bucket_addr(i) = NULL;
- }
- }
- }
-};
-
-// Combining platform and system loader dictionaries into boot loader dictionary.
-// During run time, we only have one shared dictionary.
-void SystemDictionary::combine_shared_dictionaries() {
- assert(DumpSharedSpaces, "dump time only");
- Dictionary* master_dictionary = ClassLoaderData::the_null_class_loader_data()->dictionary();
- CombineDictionariesClosure cdc(master_dictionary);
- ClassLoaderDataGraph::cld_do(&cdc);
-
- // These tables are no longer valid or necessary. Keeping them around will
- // cause SystemDictionary::verify() to fail. Let's empty them.
- _placeholders = new PlaceholderTable(_placeholder_table_size);
- _loader_constraints = new LoaderConstraintTable(_loader_constraint_size);
-
- NOT_PRODUCT(SystemDictionary::verify());
-}
-
void SystemDictionary::initialize_oop_storage() {
_vm_weak_oop_storage =
new OopStorage("VM Weak Oop Handles",