Mercurial > hg > graal-compiler
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp Tue Jan 15 18:54:02 2013 +0100 +++ b/src/share/vm/runtime/thread.cpp Wed Jan 16 01:34:24 2013 +0100 @@ -2206,8 +2206,8 @@ // BiasedLocking needs an updated RegisterMap for the revoke monitors pass RegisterMap reg_map(this, UseBiasedLocking); frame compiled_frame = f.sender(®_map); - if (compiled_frame.can_be_deoptimized()) { - Deoptimization::deoptimize(this, compiled_frame, ®_map, Deoptimization::Reason_constraint); + if (!StressCompiledExceptionHandlers && compiled_frame.can_be_deoptimized()) { + Deoptimization::deoptimize(this, compiled_frame, ®_map); } } } @@ -3540,11 +3540,12 @@ java_lang_Thread::set_thread_status(thread_object, java_lang_Thread::RUNNABLE); - // The VM preresolve methods to these classes. Make sure that get initialized + // The VM creates & returns objects of this class. Make sure it's initialized. + initialize_class(vmSymbols::java_lang_Class(), CHECK_0); + + // The VM preresolves methods to these classes. Make sure that they get initialized initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0); initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0); - // The VM creates & returns objects of this class. Make sure it's initialized. - initialize_class(vmSymbols::java_lang_Class(), CHECK_0); call_initializeSystemClass(CHECK_0); // get the Java runtime name after java.lang.System is initialized