Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/deoptimization.cpp @ 4140:716a2c5c0656
Further reduce diff to HotSpot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sun, 18 Dec 2011 01:01:34 +0100 |
parents | 04b9a2566eec |
children | 9ae5048b9153 |
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/runtime/deoptimization.cpp Sun Dec 18 01:01:34 2011 +0100 @@ -212,6 +212,7 @@ assert(vf->is_compiled_frame(), "Wrong frame type"); chunk->push(compiledVFrame::cast(vf)); + // TODO(tw): Fix this hack after introducing GRAAL macro. //#ifdef COMPILER2 // Reallocate the non-escaping objects and restore their fields. Then // relock objects if synchronization on them was eliminated. @@ -1255,14 +1256,12 @@ DeoptAction action = trap_request_action(trap_request); jint unloaded_class_index = trap_request_index(trap_request); // CP idx or -1 -// tty->print_cr("trap_request: %08x, cpi: %i, pc: %016x", trap_request, unloaded_class_index, fr.pc()); - - Events::log("Uncommon trap occurred @" INTPTR_FORMAT " unloaded_class_index = %d", fr.pc(), (int) trap_request); vframe* vf = vframe::new_vframe(&fr, ®_map, thread); compiledVFrame* cvf = compiledVFrame::cast(vf); - + nmethod* nm = cvf->code(); + ScopeDesc* trap_scope = cvf->scope(); if (TraceDeoptimization) {