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

8143269: Refactor code in universe_post_init that sets up methods to upcall

Browse source 
Deferred code review cleanups

Reviewed-by: dholmes, hseigel
This commit is contained in:
Coleen Phillimore 2016-03-24 10:19:31 -04:00
parent 49d6460189
commit 1d25ca2a9e
3 changed files with 91 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hotspot/src/share/vm/classfile/vmSymbols.hpp
View file

@ -102,7 +102,6 @@
template(java_security_SecureClassLoader, "java/security/SecureClassLoader") \ template(java_security_SecureClassLoader, "java/security/SecureClassLoader") \
template(java_net_URL, "java/net/URL") \ template(java_net_URL, "java/net/URL") \
template(java_util_jar_Manifest, "java/util/jar/Manifest") \ template(java_util_jar_Manifest, "java/util/jar/Manifest") \
template(impliesCreateAccessControlContext_name, "impliesCreateAccessControlContext") \
template(java_io_OutputStream, "java/io/OutputStream") \ template(java_io_OutputStream, "java/io/OutputStream") \
template(java_io_Reader, "java/io/Reader") \ template(java_io_Reader, "java/io/Reader") \
template(java_io_BufferedReader, "java/io/BufferedReader") \ template(java_io_BufferedReader, "java/io/BufferedReader") \
@ -326,7 +325,6 @@
template(java_lang_StackFrameInfo, "java/lang/StackFrameInfo") \ template(java_lang_StackFrameInfo, "java/lang/StackFrameInfo") \
template(java_lang_LiveStackFrameInfo, "java/lang/LiveStackFrameInfo") \ template(java_lang_LiveStackFrameInfo, "java/lang/LiveStackFrameInfo") \
template(java_lang_StackStreamFactory_AbstractStackWalker, "java/lang/StackStreamFactory$AbstractStackWalker") \ template(java_lang_StackStreamFactory_AbstractStackWalker, "java/lang/StackStreamFactory$AbstractStackWalker") \
template(doStackWalk_name, "doStackWalk") \
template(doStackWalk_signature, "(JIIII)Ljava/lang/Object;") \ template(doStackWalk_signature, "(JIIII)Ljava/lang/Object;") \
template(asPrimitive_name, "asPrimitive") \ template(asPrimitive_name, "asPrimitive") \
template(asPrimitive_int_signature, "(I)Ljava/lang/LiveStackFrame$PrimitiveValue;") \ template(asPrimitive_int_signature, "(I)Ljava/lang/LiveStackFrame$PrimitiveValue;") \
@ -377,8 +375,6 @@
template(type_name, "type") \ template(type_name, "type") \
template(findNative_name, "findNative") \ template(findNative_name, "findNative") \
template(deadChild_name, "deadChild") \ template(deadChild_name, "deadChild") \
template(addClass_name, "addClass") \
template(throwIllegalAccessError_name, "throwIllegalAccessError") \
template(getFromClass_name, "getFromClass") \ template(getFromClass_name, "getFromClass") \
template(dispatch_name, "dispatch") \ template(dispatch_name, "dispatch") \
template(getSystemClassLoader_name, "getSystemClassLoader") \ template(getSystemClassLoader_name, "getSystemClassLoader") \
@ -473,10 +469,6 @@
template(url_code_signer_array_void_signature, "(Ljava/net/URL;[Ljava/security/CodeSigner;)V") \ template(url_code_signer_array_void_signature, "(Ljava/net/URL;[Ljava/security/CodeSigner;)V") \
template(module_entry_name, "module_entry") \ template(module_entry_name, "module_entry") \
\ \
/* non-intrinsic name/signature pairs: */ \
template(register_method_name, "register") \
do_alias(register_method_signature, object_void_signature) \
\
/* name symbols needed by intrinsics */ \ /* name symbols needed by intrinsics */ \
VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, VM_SYMBOL_IGNORE, template, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \ VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, VM_SYMBOL_IGNORE, template, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \
\ \

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

@ -878,6 +878,57 @@ Universe::NARROW_OOP_MODE Universe::narrow_oop_mode() {
return UnscaledNarrowOop; return UnscaledNarrowOop;
} }
void initialize_known_method(LatestMethodCache* method_cache,
InstanceKlass* ik,
const char* method,
Symbol* signature,
bool is_static, TRAPS)
{
TempNewSymbol name = SymbolTable::new_symbol(method, CHECK);
Method* m = NULL;
// The klass must be linked before looking up the method.
if (!ik->link_class_or_fail(THREAD) ||
((m = ik->find_method(name, signature)) == NULL) ||
is_static != m->is_static()) {
ResourceMark rm(THREAD);
// NoSuchMethodException doesn't actually work because it tries to run the
// <init> function before java_lang_Class is linked. Print error and exit.
vm_exit_during_initialization(err_msg("Unable to link/verify %s.%s method",
ik->name()->as_C_string(), method));
}
method_cache->init(ik, m);
}
void Universe::initialize_known_methods(TRAPS) {
// Set up static method for registering finalizers
initialize_known_method(_finalizer_register_cache,
SystemDictionary::Finalizer_klass(),
"register",
vmSymbols::object_void_signature(), true, CHECK);
initialize_known_method(_throw_illegal_access_error_cache,
SystemDictionary::internal_Unsafe_klass(),
"throwIllegalAccessError",
vmSymbols::void_method_signature(), true, CHECK);
// Set up method for registering loaded classes in class loader vector
initialize_known_method(_loader_addClass_cache,
SystemDictionary::ClassLoader_klass(),
"addClass",
vmSymbols::class_void_signature(), false, CHECK);
// Set up method for checking protection domain
initialize_known_method(_pd_implies_cache,
SystemDictionary::ProtectionDomain_klass(),
"impliesCreateAccessControlContext",
vmSymbols::void_boolean_signature(), false, CHECK);
// Set up method for stack walking
initialize_known_method(_do_stack_walk_cache,
SystemDictionary::AbstractStackWalker_klass(),
"doStackWalk",
vmSymbols::doStackWalk_signature(), false, CHECK);
}
void universe2_init() { void universe2_init() {
EXCEPTION_MARK; EXCEPTION_MARK;
@ -906,46 +957,46 @@ bool universe_post_init() {
HandleMark hm(THREAD); HandleMark hm(THREAD);
Klass* k; Klass* k;
instanceKlassHandle k_h; instanceKlassHandle k_h;
// Setup preallocated empty java.lang.Class array // Setup preallocated empty java.lang.Class array
Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_false); Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_false);
// Setup preallocated OutOfMemoryError errors // Setup preallocated OutOfMemoryError errors
k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_OutOfMemoryError(), true, CHECK_false); k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_OutOfMemoryError(), true, CHECK_false);
k_h = instanceKlassHandle(THREAD, k); k_h = instanceKlassHandle(THREAD, k);
Universe::_out_of_memory_error_java_heap = k_h->allocate_instance(CHECK_false); Universe::_out_of_memory_error_java_heap = k_h->allocate_instance(CHECK_false);
Universe::_out_of_memory_error_metaspace = k_h->allocate_instance(CHECK_false); Universe::_out_of_memory_error_metaspace = k_h->allocate_instance(CHECK_false);
Universe::_out_of_memory_error_class_metaspace = k_h->allocate_instance(CHECK_false); Universe::_out_of_memory_error_class_metaspace = k_h->allocate_instance(CHECK_false);
Universe::_out_of_memory_error_array_size = k_h->allocate_instance(CHECK_false); Universe::_out_of_memory_error_array_size = k_h->allocate_instance(CHECK_false);
Universe::_out_of_memory_error_gc_overhead_limit = Universe::_out_of_memory_error_gc_overhead_limit =
k_h->allocate_instance(CHECK_false); k_h->allocate_instance(CHECK_false);
Universe::_out_of_memory_error_realloc_objects = k_h->allocate_instance(CHECK_false); Universe::_out_of_memory_error_realloc_objects = k_h->allocate_instance(CHECK_false);
// Setup preallocated cause message for delayed StackOverflowError // Setup preallocated cause message for delayed StackOverflowError
if (StackReservedPages > 0) { if (StackReservedPages > 0) {
Universe::_delayed_stack_overflow_error_message = Universe::_delayed_stack_overflow_error_message =
java_lang_String::create_oop_from_str("Delayed StackOverflowError due to ReservedStackAccess annotated method", CHECK_false); java_lang_String::create_oop_from_str("Delayed StackOverflowError due to ReservedStackAccess annotated method", CHECK_false);
} }
// Setup preallocated NullPointerException // Setup preallocated NullPointerException
// (this is currently used for a cheap & dirty solution in compiler exception handling) // (this is currently used for a cheap & dirty solution in compiler exception handling)
k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_NullPointerException(), true, CHECK_false); k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_NullPointerException(), true, CHECK_false);
Universe::_null_ptr_exception_instance = InstanceKlass::cast(k)->allocate_instance(CHECK_false); Universe::_null_ptr_exception_instance = InstanceKlass::cast(k)->allocate_instance(CHECK_false);
// Setup preallocated ArithmeticException // Setup preallocated ArithmeticException
// (this is currently used for a cheap & dirty solution in compiler exception handling) // (this is currently used for a cheap & dirty solution in compiler exception handling)
k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_ArithmeticException(), true, CHECK_false); k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_ArithmeticException(), true, CHECK_false);
Universe::_arithmetic_exception_instance = InstanceKlass::cast(k)->allocate_instance(CHECK_false); Universe::_arithmetic_exception_instance = InstanceKlass::cast(k)->allocate_instance(CHECK_false);
// Virtual Machine Error for when we get into a situation we can't resolve // Virtual Machine Error for when we get into a situation we can't resolve
k = SystemDictionary::resolve_or_fail( k = SystemDictionary::resolve_or_fail(
vmSymbols::java_lang_VirtualMachineError(), true, CHECK_false); vmSymbols::java_lang_VirtualMachineError(), true, CHECK_false);
bool linked = InstanceKlass::cast(k)->link_class_or_fail(CHECK_false); bool linked = InstanceKlass::cast(k)->link_class_or_fail(CHECK_false);
if (!linked) { if (!linked) {
tty->print_cr("Unable to link/verify VirtualMachineError class"); tty->print_cr("Unable to link/verify VirtualMachineError class");
return false; // initialization failed return false; // initialization failed
} }
Universe::_virtual_machine_error_instance = Universe::_virtual_machine_error_instance =
InstanceKlass::cast(k)->allocate_instance(CHECK_false); InstanceKlass::cast(k)->allocate_instance(CHECK_false);
Universe::_vm_exception = InstanceKlass::cast(k)->allocate_instance(CHECK_false); Universe::_vm_exception = InstanceKlass::cast(k)->allocate_instance(CHECK_false);
if (!DumpSharedSpaces) { if (!DumpSharedSpaces) {
// These are the only Java fields that are currently set during shared space dumping. // These are the only Java fields that are currently set during shared space dumping.
@ -986,71 +1037,7 @@ bool universe_post_init() {
Universe::_preallocated_out_of_memory_error_avail_count = (jint)len; Universe::_preallocated_out_of_memory_error_avail_count = (jint)len;
} }
Universe::initialize_known_methods(CHECK_false);
// Setup static method for registering finalizers
// The finalizer klass must be linked before looking up the method, in
// case it needs to get rewritten.
SystemDictionary::Finalizer_klass()->link_class(CHECK_false);
Method* m = SystemDictionary::Finalizer_klass()->find_method(
vmSymbols::register_method_name(),
vmSymbols::register_method_signature());
if (m == NULL || !m->is_static()) {
tty->print_cr("Unable to link/verify Finalizer.register method");
return false; // initialization failed (cannot throw exception yet)
}
Universe::_finalizer_register_cache->init(
SystemDictionary::Finalizer_klass(), m);
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()) {
// Note null is okay; this method is used in itables, and if it is null,
// then AbstractMethodError is thrown instead.
tty->print_cr("Unable to link/verify Unsafe.throwIllegalAccessError method");
return false; // initialization failed (cannot throw exception yet)
}
Universe::_throw_illegal_access_error_cache->init(
SystemDictionary::internal_Unsafe_klass(), m);
// Setup method for registering loaded classes in class loader vector
SystemDictionary::ClassLoader_klass()->link_class(CHECK_false);
m = SystemDictionary::ClassLoader_klass()->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
if (m == NULL || m->is_static()) {
tty->print_cr("Unable to link/verify ClassLoader.addClass method");
return false; // initialization failed (cannot throw exception yet)
}
Universe::_loader_addClass_cache->init(
SystemDictionary::ClassLoader_klass(), m);
// Setup method for checking protection domain
SystemDictionary::ProtectionDomain_klass()->link_class(CHECK_false);
m = SystemDictionary::ProtectionDomain_klass()->
find_method(vmSymbols::impliesCreateAccessControlContext_name(),
vmSymbols::void_boolean_signature());
// Allow NULL which should only happen with bootstrapping.
if (m != NULL) {
if (m->is_static()) {
// NoSuchMethodException doesn't actually work because it tries to run the
// <init> function before java_lang_Class is linked. Print error and exit.
tty->print_cr("ProtectionDomain.impliesCreateAccessControlContext() has the wrong linkage");
return false; // initialization failed
}
Universe::_pd_implies_cache->init(
SystemDictionary::ProtectionDomain_klass(), m);
}
// Setup method for stack walking
InstanceKlass::cast(SystemDictionary::AbstractStackWalker_klass())->link_class(CHECK_false);
m = InstanceKlass::cast(SystemDictionary::AbstractStackWalker_klass())->
find_method(vmSymbols::doStackWalk_name(),
vmSymbols::doStackWalk_signature());
// Allow NULL which should only happen with bootstrapping.
if (m != NULL) {
Universe::_do_stack_walk_cache->init(
SystemDictionary::AbstractStackWalker_klass(), m);
}
// This needs to be done before the first scavenge/gc, since // This needs to be done before the first scavenge/gc, since
// it's an input to soft ref clearing policy. // it's an input to soft ref clearing policy.

3
hotspot/src/share/vm/memory/universe.hpp
View file

@ -323,6 +323,9 @@ class Universe: AllStatic {
static Method* do_stack_walk_method() { return _do_stack_walk_cache->get_method(); } static Method* do_stack_walk_method() { return _do_stack_walk_cache->get_method(); }
// Function to initialize these
static void initialize_known_methods(TRAPS);
static oop null_ptr_exception_instance() { return _null_ptr_exception_instance; } static oop null_ptr_exception_instance() { return _null_ptr_exception_instance; }
static oop arithmetic_exception_instance() { return _arithmetic_exception_instance; } static oop arithmetic_exception_instance() { return _arithmetic_exception_instance; }
static oop virtual_machine_error_instance() { return _virtual_machine_error_instance; } static oop virtual_machine_error_instance() { return _virtual_machine_error_instance; }