8278053: serviceability/jvmti/vthread/ContStackDepthTest/ContStackDepthTest.java failing in loom repo with Xcomp

Reviewed-by: sspitsyn, pchilanomate, coleenp
This commit is contained in:
Ron Pressler 2022-06-21 16:48:33 +00:00 committed by Serguei Spitsyn
parent 31d981e5ea
commit 97200a78b1
2 changed files with 4 additions and 3 deletions
src/hotspot/share/runtime
test/hotspot/jtreg

@ -1965,6 +1965,10 @@ inline void ThawBase::patch(frame& f, const frame& caller, bool bottom) {
if (bottom) {
ContinuationHelper::Frame::patch_pc(caller, _cont.is_empty() ? caller.pc()
: StubRoutines::cont_returnBarrier());
} else {
// caller might have been deoptimized during thaw but we've overwritten the return address when copying f from the heap.
// If the caller is not deoptimized, pc is unchanged.
ContinuationHelper::Frame::patch_pc(caller, caller.raw_pc());
}
patch_pd(f, caller);

@ -31,9 +31,6 @@ vmTestbase/nsk/jvmti/AttachOnDemand/attach022/TestDescription.java 8277573 gener
vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/TestDescription.java 8205957 generic-all
serviceability/jvmti/vthread/ContFramePopTest/ContFramePopTest.java 8278053 generic-all
serviceability/jvmti/vthread/ContStackDepthTest/ContStackDepthTest.java 8278053 generic-all
serviceability/sa/TestJhsdbJstackMixed.java 8248675 linux-aarch64
vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/TestDescription.java 8245680 windows-x64