Mercurial > hg > truffle
diff src/share/vm/runtime/deoptimization.cpp @ 1832:22e4420d19f7
Merge
author | kvn |
---|---|
date | Wed, 06 Oct 2010 14:18:32 -0700 |
parents | fd5d4527cdf5 |
children | ce6848d0666d |
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp Fri Oct 01 18:04:36 2010 -0700 +++ b/src/share/vm/runtime/deoptimization.cpp Wed Oct 06 14:18:32 2010 -0700 @@ -124,6 +124,9 @@ RegisterMap dummy_map(thread, false); // Now get the deoptee with a valid map frame deoptee = stub_frame.sender(&map); + // Set the deoptee nmethod + assert(thread->deopt_nmethod() == NULL, "Pending deopt!"); + thread->set_deopt_nmethod(deoptee.cb()->as_nmethod_or_null()); // Create a growable array of VFrames where each VFrame represents an inlined // Java frame. This storage is allocated with the usual system arena. @@ -445,6 +448,7 @@ delete thread->deopt_mark(); thread->set_deopt_mark(NULL); + thread->set_deopt_nmethod(NULL); if (JvmtiExport::can_pop_frame()) {