archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Coleen Phillimore 2015-10-28 15:03:40 +01:00
commit b046110ab7
41 changed files with 620 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/memory/universe.cpp
View file

@ -1008,8 +1008,8 @@ bool universe_post_init() {
Universe::_finalizer_register_cache->init(
SystemDictionary::Finalizer_klass(), m);
SystemDictionary::misc_Unsafe_klass()->link_class(CHECK_false);
m = SystemDictionary::misc_Unsafe_klass()->find_method(
SystemDictionary::internal_Unsafe_klass()->link_class(CHECK_false);
m = SystemDictionary::internal_Unsafe_klass()->find_method(
vmSymbols::throwIllegalAccessError_name(),
vmSymbols::void_method_signature());
if (m != NULL && !m->is_static()) {
@ -1019,7 +1019,7 @@ bool universe_post_init() {
return false; // initialization failed (cannot throw exception yet)
}
Universe::_throw_illegal_access_error_cache->init(
SystemDictionary::misc_Unsafe_klass(), m);
SystemDictionary::internal_Unsafe_klass(), m);
// Setup method for registering loaded classes in class loader vector
SystemDictionary::ClassLoader_klass()->link_class(CHECK_false);