Mercurial > hg > openjdk > jdk8u > nashorn
changeset 2521:eef87c0da03e jdk8u262-b04
8171934: ObjectSizeCalculator.getEffectiveMemoryLayoutSpecification() does not recognize OpenJDK's HotSpot VM
Reviewed-by: aph, andrew
Contributed-by: hedongbo@huawei.com
author | fyang |
---|---|
date | Sun, 24 May 2020 22:47:36 +0800 |
parents | f5a3d8f60cf5 |
children | e2a7c53cfa4d |
files | src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java Tue May 19 05:11:20 2020 +0100 +++ b/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java Sun May 24 22:47:36 2020 +0800 @@ -396,7 +396,8 @@ */ public static MemoryLayoutSpecification getEffectiveMemoryLayoutSpecification() { final String vmName = System.getProperty("java.vm.name"); - if (vmName == null || !vmName.startsWith("Java HotSpot(TM) ")) { + if (vmName == null + || (!vmName.startsWith("OpenJDK ") && !vmName.startsWith("Java HotSpot(TM) "))) { throw new UnsupportedOperationException( "ObjectSizeCalculator only supported on HotSpot VM"); }