Mercurial > hg > graal-compiler

comparison src/share/vm/memory/universe.cpp @ 14442:1174c8abbdb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Thu, 05 Dec 2013 15:13:12 -0800
parents da862781b584 9d15b81d5d1b
children 8a9bb7821e28 62c54fcc0a35
comparison
equal deleted inserted replaced
14441:e7cbc95179c4 14442:1174c8abbdb6
118 bool Universe::_verify_in_progress = false; 118 bool Universe::_verify_in_progress = false;
119 oop Universe::_null_ptr_exception_instance = NULL; 119 oop Universe::_null_ptr_exception_instance = NULL;
120 oop Universe::_arithmetic_exception_instance = NULL; 120 oop Universe::_arithmetic_exception_instance = NULL;
121 oop Universe::_virtual_machine_error_instance = NULL; 121 oop Universe::_virtual_machine_error_instance = NULL;
122 oop Universe::_vm_exception = NULL; 122 oop Universe::_vm_exception = NULL;
123 Method* Universe::_throw_illegal_access_error = NULL;
123 Array<int>* Universe::_the_empty_int_array = NULL; 124 Array<int>* Universe::_the_empty_int_array = NULL;
124 Array<u2>* Universe::_the_empty_short_array = NULL; 125 Array<u2>* Universe::_the_empty_short_array = NULL;
125 Array<Klass*>* Universe::_the_empty_klass_array = NULL; 126 Array<Klass*>* Universe::_the_empty_klass_array = NULL;
126 Array<Method*>* Universe::_the_empty_method_array = NULL; 127 Array<Method*>* Universe::_the_empty_method_array = NULL;
127 128
1099 return false; // initialization failed (cannot throw exception yet) 1100 return false; // initialization failed (cannot throw exception yet)
1100 } 1101 }
1101 Universe::_finalizer_register_cache->init( 1102 Universe::_finalizer_register_cache->init(
1102 SystemDictionary::Finalizer_klass(), m); 1103 SystemDictionary::Finalizer_klass(), m);
1103 1104
1105 InstanceKlass::cast(SystemDictionary::misc_Unsafe_klass())->link_class(CHECK_false);
1106 m = InstanceKlass::cast(SystemDictionary::misc_Unsafe_klass())->find_method(
1107 vmSymbols::throwIllegalAccessError_name(),
1108 vmSymbols::void_method_signature());
1109 if (m != NULL && !m->is_static()) {
1110 // Note null is okay; this method is used in itables, and if it is null,
1111 // then AbstractMethodError is thrown instead.
1112 tty->print_cr("Unable to link/verify Unsafe.throwIllegalAccessError method");
1113 return false; // initialization failed (cannot throw exception yet)
1114 }
1115 Universe::_throw_illegal_access_error = m;
1116
1104 // Setup method for registering loaded classes in class loader vector 1117 // Setup method for registering loaded classes in class loader vector
1105 InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false); 1118 InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
1106 m = InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature()); 1119 m = InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
1107 if (m == NULL || m->is_static()) { 1120 if (m == NULL || m->is_static()) {
1108 tty->print_cr("Unable to link/verify ClassLoader.addClass method"); 1121 tty->print_cr("Unable to link/verify ClassLoader.addClass method");