Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/thread.cpp @ 7482:989155e2d07a
Merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 01:34:24 +0100 |
parents | 291ffc492eb6 69627aa9ab10 |
children | 729a79037bd5 |
comparison
equal
deleted
inserted
replaced
7381:6761a8f854a4 | 7482:989155e2d07a |
---|---|
2204 frame f = last_frame(); | 2204 frame f = last_frame(); |
2205 if (f.is_runtime_frame() || f.is_safepoint_blob_frame()) { | 2205 if (f.is_runtime_frame() || f.is_safepoint_blob_frame()) { |
2206 // BiasedLocking needs an updated RegisterMap for the revoke monitors pass | 2206 // BiasedLocking needs an updated RegisterMap for the revoke monitors pass |
2207 RegisterMap reg_map(this, UseBiasedLocking); | 2207 RegisterMap reg_map(this, UseBiasedLocking); |
2208 frame compiled_frame = f.sender(®_map); | 2208 frame compiled_frame = f.sender(®_map); |
2209 if (compiled_frame.can_be_deoptimized()) { | 2209 if (!StressCompiledExceptionHandlers && compiled_frame.can_be_deoptimized()) { |
2210 Deoptimization::deoptimize(this, compiled_frame, ®_map, Deoptimization::Reason_constraint); | 2210 Deoptimization::deoptimize(this, compiled_frame, ®_map); |
2211 } | 2211 } |
2212 } | 2212 } |
2213 } | 2213 } |
2214 | 2214 |
2215 // Set async. pending exception in thread. | 2215 // Set async. pending exception in thread. |
3538 // Set thread status to running since main thread has | 3538 // Set thread status to running since main thread has |
3539 // been started and running. | 3539 // been started and running. |
3540 java_lang_Thread::set_thread_status(thread_object, | 3540 java_lang_Thread::set_thread_status(thread_object, |
3541 java_lang_Thread::RUNNABLE); | 3541 java_lang_Thread::RUNNABLE); |
3542 | 3542 |
3543 // The VM preresolve methods to these classes. Make sure that get initialized | 3543 // The VM creates & returns objects of this class. Make sure it's initialized. |
3544 initialize_class(vmSymbols::java_lang_Class(), CHECK_0); | |
3545 | |
3546 // The VM preresolves methods to these classes. Make sure that they get initialized | |
3544 initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0); | 3547 initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0); |
3545 initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0); | 3548 initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0); |
3546 // The VM creates & returns objects of this class. Make sure it's initialized. | |
3547 initialize_class(vmSymbols::java_lang_Class(), CHECK_0); | |
3548 call_initializeSystemClass(CHECK_0); | 3549 call_initializeSystemClass(CHECK_0); |
3549 | 3550 |
3550 // get the Java runtime name after java.lang.System is initialized | 3551 // get the Java runtime name after java.lang.System is initialized |
3551 JDK_Version::set_runtime_name(get_java_runtime_name(THREAD)); | 3552 JDK_Version::set_runtime_name(get_java_runtime_name(THREAD)); |
3552 JDK_Version::set_runtime_version(get_java_runtime_version(THREAD)); | 3553 JDK_Version::set_runtime_version(get_java_runtime_version(THREAD)); |