comparison src/share/vm/runtime/sharedRuntime.cpp @ 4665:f9811bcf3402

fixed fastdebug crash (deoptimization requires that no exception is pending)
author Christian Haeubl <christian.haeubl@oracle.com>
date Tue, 21 Feb 2012 10:48:32 -0800
parents 723df37192d6
children 8021e46f4a99
comparison
equal deleted inserted replaced
4654:c3de4449719f 4665:f9811bcf3402
716 if (t == NULL && nm->is_compiled_by_c1()) { 716 if (t == NULL && nm->is_compiled_by_c1()) {
717 #ifdef GRAAL 717 #ifdef GRAAL
718 nm->make_not_entrant(); 718 nm->make_not_entrant();
719 JavaThread::current()->set_exception_pc(ret_pc); 719 JavaThread::current()->set_exception_pc(ret_pc);
720 JavaThread::current()->set_exception_oop(exception()); 720 JavaThread::current()->set_exception_oop(exception());
721 JavaThread::current()->clear_pending_exception();
721 return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); 722 return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls();
722 #else 723 #else
723 assert(nm->unwind_handler_begin() != NULL, ""); 724 assert(nm->unwind_handler_begin() != NULL, "");
724 return nm->unwind_handler_begin(); 725 return nm->unwind_handler_begin();
725 #endif 726 #endif