Skip to content

Commit 8f1c134

Browse files
committedAug 11, 2023
8313798: [aarch64] sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java sometimes times out on aarch64
Reviewed-by: kevinw, sspitsyn
1 parent 1232677 commit 8f1c134

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed
 

‎src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VFrame.java

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
2727
import java.io.*;
2828
import sun.jvm.hotspot.code.*;
2929
import sun.jvm.hotspot.utilities.*;
30+
import sun.jvm.hotspot.debugger.Address;
3031

3132
public class VFrame {
3233
protected Frame fr;
@@ -145,7 +146,16 @@ public JavaVFrame javaSender() {
145146
if (f.isJavaFrame()) {
146147
return (JavaVFrame) f;
147148
}
149+
Address oldSP = f.getFrame().getSP();
148150
f = f.sender(imprecise);
151+
if (f != null) {
152+
// Make sure the sender frame is above the current frame, not below
153+
Address newSP = f.getFrame().getSP();
154+
if (oldSP.greaterThanOrEqual(newSP)) {
155+
String errString = "newSP(" + newSP + ") is not above oldSP(" + oldSP + ")";
156+
throw new RuntimeException(errString);
157+
}
158+
}
149159
}
150160
return null;
151161
}

‎test/jdk/ProblemList.txt

-1
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,6 @@ sun/tools/jstat/jstatLineCounts3.sh 8268211 linux-aa
734734
sun/tools/jstat/jstatLineCounts4.sh 8268211 linux-aarch64
735735

736736
sun/tools/jhsdb/JStackStressTest.java 8276210 linux-aarch64
737-
sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8313798 generic-aarch64
738737

739738
############################################################################
740739

0 commit comments

Comments
 (0)
Please sign in to comment.