Sun, 24 May 2020 22:47:36 +0800
8171934: ObjectSizeCalculator.getEffectiveMemoryLayoutSpecification() does not recognize OpenJDK's HotSpot VM
Reviewed-by: aph, andrew
Contributed-by: hedongbo@huawei.com
src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java | file | annotate | diff | comparison | revisions |
1.1 --- a/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java Tue May 19 05:11:20 2020 +0100 1.2 +++ b/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java Sun May 24 22:47:36 2020 +0800 1.3 @@ -396,7 +396,8 @@ 1.4 */ 1.5 public static MemoryLayoutSpecification getEffectiveMemoryLayoutSpecification() { 1.6 final String vmName = System.getProperty("java.vm.name"); 1.7 - if (vmName == null || !vmName.startsWith("Java HotSpot(TM) ")) { 1.8 + if (vmName == null 1.9 + || (!vmName.startsWith("OpenJDK ") && !vmName.startsWith("Java HotSpot(TM) "))) { 1.10 throw new UnsupportedOperationException( 1.11 "ObjectSizeCalculator only supported on HotSpot VM"); 1.12 }