Mercurial > hg > graal-compiler
diff src/share/vm/runtime/vframe_hp.cpp @ 83:d3cd40645d0d
6681646: Relocking of a scalar replaced object during deoptimization is broken
Summary: Relocking of a thread-local object during deoptimization is broken
Reviewed-by: kbr, jrose, never
author | kvn |
---|---|
date | Tue, 01 Apr 2008 16:14:18 -0700 |
parents | a61af66fc99e |
children | d1605aabd0a1 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vframe_hp.cpp Mon Mar 31 18:37:36 2008 -0700 +++ b/src/share/vm/runtime/vframe_hp.cpp Tue Apr 01 16:14:18 2008 -0700 @@ -190,7 +190,7 @@ // Casting away const frame& fr = (frame&) _fr; MonitorInfo* info = new MonitorInfo(fr.compiled_synchronized_native_monitor_owner(nm), - fr.compiled_synchronized_native_monitor(nm)); + fr.compiled_synchronized_native_monitor(nm), false); monitors->push(info); return monitors; } @@ -202,7 +202,7 @@ for (int index = 0; index < monitors->length(); index++) { MonitorValue* mv = monitors->at(index); StackValue *owner_sv = create_stack_value(mv->owner()); // it is an oop - result->push(new MonitorInfo(owner_sv->get_obj()(), resolve_monitor_lock(mv->basic_lock()))); + result->push(new MonitorInfo(owner_sv->get_obj()(), resolve_monitor_lock(mv->basic_lock()), mv->eliminated())); } return result; }