# HG changeset patch
# User fyang
# Date 1590331656 -28800
# Node ID eef87c0da03ebb76368edb3195c1c5924edda265
# Parent  f5a3d8f60cf552b6566a17831b54723e5d4de136
8171934: ObjectSizeCalculator.getEffectiveMemoryLayoutSpecification() does not recognize OpenJDK's HotSpot VM
Reviewed-by: aph, andrew
Contributed-by: hedongbo@huawei.com

diff -r f5a3d8f60cf5 -r eef87c0da03e src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java
--- 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");
         }