OpenJDK / jdk / jdk
changeset 58945:46bca5e5e6fb jdk-15+20
8243210: ClhsdbScanOops fails with NullPointerException in FileMapHeader.inCopiedVtableSpace
Reviewed-by: iklam, sspitsyn
| author | cjplummer |
|---|---|
| date | Wed, 22 Apr 2020 15:09:32 -0700 |
| parents | cf5a0e951c9e |
| children | 6582ed771a9e |
| files | src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java test/hotspot/jtreg/ProblemList.txt |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java Wed Apr 22 17:59:59 2020 -0400 +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java Wed Apr 22 15:09:32 2020 -0700 @@ -151,6 +151,9 @@ } public boolean inCopiedVtableSpace(Address vptrAddress) { + if (vptrAddress == null) { + return false; + } if (vptrAddress.greaterThan(mcRegionBaseAddress) && vptrAddress.lessThanOrEqual(mcRegionEndAddress)) { return true;
--- a/test/hotspot/jtreg/ProblemList.txt Wed Apr 22 17:59:59 2020 -0400 +++ b/test/hotspot/jtreg/ProblemList.txt Wed Apr 22 15:09:32 2020 -0700 @@ -101,8 +101,6 @@ # :hotspot_serviceability -serviceability/sa/ClhsdbScanOops.java#id0 8243210 macosx-x64 -serviceability/sa/ClhsdbScanOops.java#id1 8243210 macosx-x64 serviceability/sa/sadebugd/DebugdConnectTest.java 8239062 macosx-x64 serviceability/sa/TestInstanceKlassSize.java 8230664 linux-ppc64le,linux-ppc64 serviceability/sa/TestInstanceKlassSizeForInterface.java 8230664 linux-ppc64le,linux-ppc64