archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8238782: Cleanup Deoptimization::deoptimize(): remove unused RegisterMap argument and don't update RegisterMap in callers if UseBiasedLocking is enabled

Browse source 
Reviewed-by: dholmes, kvn
This commit is contained in:
Richard Reingruber 2020-02-12 09:18:37 +01:00
parent 446f59a26c
commit b0b8190ea2
6 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View file

@ -1461,7 +1461,7 @@ C2V_VMENTRY(void, materializeVirtualObjects, (JNIEnv* env, jobject, jobject _hs_
JVMCIENV->HotSpotStackFrameReference_initialize(JVMCI_CHECK);
// look for the given stack frame
StackFrameStream fst(thread);
StackFrameStream fst(thread, false);
intptr_t* stack_pointer = (intptr_t*) JVMCIENV->get_HotSpotStackFrameReference_stackPointer(hs_frame);
while (fst.current()->sp() != stack_pointer && !fst.is_done()) {
fst.next();
@ -1477,7 +1477,7 @@ C2V_VMENTRY(void, materializeVirtualObjects, (JNIEnv* env, jobject, jobject _hs_
assert(fst.current()->cb()->is_nmethod(), "nmethod expected");
((nmethod*) fst.current()->cb())->make_not_entrant();
}
Deoptimization::deoptimize(thread, *fst.current(), fst.register_map(), Deoptimization::Reason_none);
Deoptimization::deoptimize(thread, *fst.current(), Deoptimization::Reason_none);
// look for the frame again as it has been updated by deopt (pc, deopt state...)
StackFrameStream fstAfterDeopt(thread);
while (fstAfterDeopt.current()->sp() != stack_pointer && !fstAfterDeopt.is_done()) {