8313798: [aarch64] sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java sometimes times out on aarch64

Reviewed-by: kevinw, sspitsyn
This commit is contained in:
Chris Plummer 2023-08-11 18:09:44 +00:00
parent 12326770dc
commit 8f1c134848
2 changed files with 11 additions and 2 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -27,6 +27,7 @@ package sun.jvm.hotspot.runtime;
import java.io.*; import java.io.*;
import sun.jvm.hotspot.code.*; import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.utilities.*; import sun.jvm.hotspot.utilities.*;
import sun.jvm.hotspot.debugger.Address;
public class VFrame { public class VFrame {
protected Frame fr; protected Frame fr;
@ -145,7 +146,16 @@ public class VFrame {
if (f.isJavaFrame()) { if (f.isJavaFrame()) {
return (JavaVFrame) f; return (JavaVFrame) f;
} }
Address oldSP = f.getFrame().getSP();
f = f.sender(imprecise); f = f.sender(imprecise);
if (f != null) {
// Make sure the sender frame is above the current frame, not below
Address newSP = f.getFrame().getSP();
if (oldSP.greaterThanOrEqual(newSP)) {
String errString = "newSP(" + newSP + ") is not above oldSP(" + oldSP + ")";
throw new RuntimeException(errString);
}
}
} }
return null; return null;
} }

View File

@ -734,7 +734,6 @@ sun/tools/jstat/jstatLineCounts3.sh 8268211 linux-aa
sun/tools/jstat/jstatLineCounts4.sh 8268211 linux-aarch64 sun/tools/jstat/jstatLineCounts4.sh 8268211 linux-aarch64
sun/tools/jhsdb/JStackStressTest.java 8276210 linux-aarch64 sun/tools/jhsdb/JStackStressTest.java 8276210 linux-aarch64
sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8313798 generic-aarch64
############################################################################ ############################################################################