8235220: ClhsdbScanOops.java fails with sun.jvm.hotspot.types.WrongTypeException

Reviewed-by: amenkov, iklam
This commit is contained in:
Chris Plummer 2020-04-13 13:21:56 -07:00
parent c73934d8c8
commit 77041dc4ec
2 changed files with 7 additions and 6 deletions
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities
test/hotspot/jtreg

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -74,9 +74,10 @@ public class RobustOopDeterminator {
} else {
Metadata.instantiateWrapperFor(klassField.getValue(oop));
}
return true;
}
catch (AddressException e) {
return true;
} catch (AddressException e) {
return false;
} catch (WrongTypeException e) {
return false;
}
}

@ -99,8 +99,8 @@ runtime/ReservedStack/ReservedStackTest.java 8231031 generic-all
# :hotspot_serviceability
serviceability/sa/ClhsdbDumpheap.java 8241158 macosx-x64
serviceability/sa/ClhsdbScanOops.java#id0 8235220,8230731 linux-x64,macosx-x64,windows-x64
serviceability/sa/ClhsdbScanOops.java#id1 8235220,8230731 linux-x64,macosx-x64,windows-x64
serviceability/sa/ClhsdbScanOops.java#id0 8241158,8230731 macosx-x64,windows-x64
serviceability/sa/ClhsdbScanOops.java#id1 8241158,8230731 macosx-x64,windows-x64
serviceability/sa/sadebugd/DebugdConnectTest.java 8239062 macosx-x64
serviceability/sa/TestHeapDumpForInvokeDynamic.java 8241158 macosx-x64
serviceability/sa/TestInstanceKlassSize.java 8230664 linux-ppc64le,linux-ppc64