Mercurial > hg > truffle

changeset 4665:f9811bcf3402

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c3de4449719f
children 82fda7201cd6
files src/share/vm/runtime/sharedRuntime.cpp
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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, "");