comparison src/share/vm/runtime/sharedRuntime.cpp @ 5124:837a304d0ca8

C1 bugfix, fixed C1 compilation errors
author Christian Haeubl <christian.haeubl@oracle.com>
date Tue, 20 Mar 2012 11:45:21 -0700
parents 422c979ff392
children a432e6d43aa1
comparison
equal deleted inserted replaced
5123:3d0556d10a2b 5124:837a304d0ca8
787 java_lang_Throwable::fill_in_stack_trace(exception); 787 java_lang_Throwable::fill_in_stack_trace(exception);
788 } 788 }
789 throw_and_post_jvmti_exception(thread, exception); 789 throw_and_post_jvmti_exception(thread, exception);
790 JRT_END 790 JRT_END
791 791
792 #ifdef GRAAL
792 address SharedRuntime::deoptimize_for_implicit_exception(JavaThread* thread, address pc, nmethod* nm, int deopt_reason) { 793 address SharedRuntime::deoptimize_for_implicit_exception(JavaThread* thread, address pc, nmethod* nm, int deopt_reason) {
793 assert(deopt_reason > Deoptimization::Reason_none && deopt_reason < Deoptimization::Reason_LIMIT, "invalid deopt reason"); 794 assert(deopt_reason > Deoptimization::Reason_none && deopt_reason < Deoptimization::Reason_LIMIT, "invalid deopt reason");
794 if (TraceSignals) { 795 if (TraceSignals) {
795 tty->print_cr(err_msg("Deoptimizing on implicit exception at relative pc=%d in method %s", pc - nm->entry_point(), nm->method()->name()->as_C_string())); 796 tty->print_cr(err_msg("Deoptimizing on implicit exception at relative pc=%d in method %s", pc - nm->entry_point(), nm->method()->name()->as_C_string()));
796 } 797 }
797 thread->_ScratchA = (intptr_t)pc; 798 thread->_ScratchA = (intptr_t)pc;
798 thread->_ScratchB = Deoptimization::make_trap_request((Deoptimization::DeoptReason)deopt_reason, Deoptimization::Action_reinterpret); 799 thread->_ScratchB = Deoptimization::make_trap_request((Deoptimization::DeoptReason)deopt_reason, Deoptimization::Action_reinterpret);
799 return (SharedRuntime::deopt_blob()->implicit_exception_uncommon_trap()); 800 return (SharedRuntime::deopt_blob()->implicit_exception_uncommon_trap());
800 } 801 }
802 #endif
801 803
802 JRT_ENTRY(void, SharedRuntime::throw_WrongMethodTypeException(JavaThread* thread, oopDesc* required, oopDesc* actual)) 804 JRT_ENTRY(void, SharedRuntime::throw_WrongMethodTypeException(JavaThread* thread, oopDesc* required, oopDesc* actual))
803 assert(thread == JavaThread::current() && required->is_oop() && actual->is_oop(), "bad args"); 805 assert(thread == JavaThread::current() && required->is_oop() && actual->is_oop(), "bad args");
804 ResourceMark rm; 806 ResourceMark rm;
805 char* message = SharedRuntime::generate_wrong_method_type_message(thread, required, actual); 807 char* message = SharedRuntime::generate_wrong_method_type_message(thread, required, actual);