infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-08-03 06:35:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8385661: jvmti/vthread/ThreadStateTest/ThreadStateTest.java triggers assert(f.pc() == _chunk->pc()) failed

Browse Source 
Reviewed-by: sspitsyn
Backport-of: 2456994e8494831331f7d472a08e6333c0ebd730
This commit is contained in:
Patricio Chilano Mateo 2026-06-23 15:09:35 +00:00
parent c28c951c0d
commit 5d7da3570a
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hotspot/share/prims/jvmtiEnvBase.cpp
View File

@ -1371,16 +1371,10 @@ JvmtiEnvBase::set_frame_pop(JvmtiThreadState* state, javaVFrame* jvf, jint depth
return JVMTI_ERROR_OPAQUE_FRAME;
}
if (state->is_virtual() && (thread == nullptr || !thread->is_vthread_mounted())) { // unmounted virtual thread
assert(fr.is_heap_frame(), "sanity check");
fr = jvf->stack_chunk()->derelativize(fr);
jvf->stack_chunk()->force_slow_path();
fr.deoptimize(nullptr);
} else { // platform thread or mounted virtual thread
if (fr.is_heap_frame()) {
fr = jvf->stack_chunk()->derelativize(fr);
jvf->stack_chunk()->force_slow_path();
}
if (fr.is_heap_frame()) {
assert(state->is_virtual(), "invariant");
fr.deoptimize(nullptr, jvf->stack_chunk());
} else {
Deoptimization::deoptimize(thread, fr);
}
}

16
src/hotspot/share/runtime/frame.cpp
View File

@ -387,6 +387,22 @@ void frame::deoptimize(JavaThread* thread) {
#endif // ASSERT
}
void frame::deoptimize(JavaThread* thread, stackChunkOop chunk) {
assert(is_heap_frame() && _frame_index >= 0, "wrong frame type");
// Fast path does not expect deopted frames
chunk->force_slow_path();
frame fr = chunk->derelativize(*this);
fr.deoptimize(nullptr);
// Fix chunk pc if deopted frame is the top one
bool is_top = fr.sp() == chunk->sp_address();
if (is_top) {
chunk->set_pc(fr.raw_pc());
}
}
frame frame::java_sender() const {
RegisterMap map(JavaThread::current(),
RegisterMap::UpdateMap::skip,

1
src/hotspot/share/runtime/frame.hpp
View File

@ -282,6 +282,7 @@ class frame {
// Support for deoptimization
void deoptimize(JavaThread* thread);
void deoptimize(JavaThread* thread, stackChunkOop chunk);
// The frame's original SP, before any extension by an interpreted callee;
// used for packing debug info into vframeArray objects and vframeArray lookup.