# HG changeset patch # User Christian Haeubl # Date 1329850112 28800 # Node ID f9811bcf3402da82f52ebae904cb62c6ba499de6 # Parent c3de4449719f291dbe4d6ae4fa4a44e561863425 fixed fastdebug crash (deoptimization requires that no exception is pending) diff -r c3de4449719f -r f9811bcf3402 src/share/vm/runtime/sharedRuntime.cpp --- a/src/share/vm/runtime/sharedRuntime.cpp Tue Feb 21 16:35:42 2012 +0100 +++ b/src/share/vm/runtime/sharedRuntime.cpp Tue Feb 21 10:48:32 2012 -0800 @@ -718,6 +718,7 @@ nm->make_not_entrant(); JavaThread::current()->set_exception_pc(ret_pc); JavaThread::current()->set_exception_oop(exception()); + JavaThread::current()->clear_pending_exception(); return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); #else assert(nm->unwind_handler_begin() != NULL, "");