comparison src/share/vm/runtime/thread.cpp @ 2491:0654ee04b214

Merge with OpenJDK.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 22 Apr 2011 15:30:53 +0200
parents 0cd39a385a72 38fea01eb669
children d577d07cedec
comparison
equal deleted inserted replaced
2490:29246b1d2d3c 2491:0654ee04b214
3167 instanceKlassHandle ik = instanceKlassHandle(THREAD, k()); 3167 instanceKlassHandle ik = instanceKlassHandle(THREAD, k());
3168 ik->initialize(CHECK_0); 3168 ik->initialize(CHECK_0);
3169 fieldDescriptor fd; 3169 fieldDescriptor fd;
3170 // Possible we might not find this field; if so, don't break 3170 // Possible we might not find this field; if so, don't break
3171 if (ik->find_local_field(vmSymbols::frontCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) { 3171 if (ik->find_local_field(vmSymbols::frontCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) {
3172 k()->bool_field_put(fd.offset(), true); 3172 k()->java_mirror()->bool_field_put(fd.offset(), true);
3173 } 3173 }
3174 } 3174 }
3175 3175
3176 if (UseStringCache) { 3176 if (UseStringCache) {
3177 // Forcibly initialize java/lang/StringValue and mutate the private 3177 // Forcibly initialize java/lang/StringValue and mutate the private
3183 instanceKlassHandle ik = instanceKlassHandle(THREAD, k()); 3183 instanceKlassHandle ik = instanceKlassHandle(THREAD, k());
3184 ik->initialize(CHECK_0); 3184 ik->initialize(CHECK_0);
3185 fieldDescriptor fd; 3185 fieldDescriptor fd;
3186 // Possible we might not find this field: if so, silently don't break 3186 // Possible we might not find this field: if so, silently don't break
3187 if (ik->find_local_field(vmSymbols::stringCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) { 3187 if (ik->find_local_field(vmSymbols::stringCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) {
3188 k()->bool_field_put(fd.offset(), true); 3188 k()->java_mirror()->bool_field_put(fd.offset(), true);
3189 } 3189 }
3190 } 3190 }
3191 } 3191 }
3192 } 3192 }
3193 3193
3230 warning("java.lang.ClassCastException has not been initialized"); 3230 warning("java.lang.ClassCastException has not been initialized");
3231 warning("java.lang.ArrayStoreException has not been initialized"); 3231 warning("java.lang.ArrayStoreException has not been initialized");
3232 warning("java.lang.ArithmeticException has not been initialized"); 3232 warning("java.lang.ArithmeticException has not been initialized");
3233 warning("java.lang.StackOverflowError has not been initialized"); 3233 warning("java.lang.StackOverflowError has not been initialized");
3234 } 3234 }
3235 } 3235 }
3236 3236
3237 // See : bugid 4211085. 3237 // See : bugid 4211085.
3238 // Background : the static initializer of java.lang.Compiler tries to read 3238 // Background : the static initializer of java.lang.Compiler tries to read
3239 // property"java.compiler" and read & write property "java.vm.info". 3239 // property"java.compiler" and read & write property "java.vm.info".
3240 // When a security manager is installed through the command line 3240 // When a security manager is installed through the command line
3645 3645
3646 // Hang forever on exit if we are reporting an error. 3646 // Hang forever on exit if we are reporting an error.
3647 if (ShowMessageBoxOnError && is_error_reported()) { 3647 if (ShowMessageBoxOnError && is_error_reported()) {
3648 os::infinite_sleep(); 3648 os::infinite_sleep();
3649 } 3649 }
3650 os::wait_for_keypress_at_exit();
3650 3651
3651 if (JDK_Version::is_jdk12x_version()) { 3652 if (JDK_Version::is_jdk12x_version()) {
3652 // We are the last thread running, so check if finalizers should be run. 3653 // We are the last thread running, so check if finalizers should be run.
3653 // For 1.3 or later this is done in thread->invoke_shutdown_hooks() 3654 // For 1.3 or later this is done in thread->invoke_shutdown_hooks()
3654 HandleMark rm(thread); 3655 HandleMark rm(thread);