7903262: JOL: GraphStatsWalker counts array elements incorrectly

Reviewed-by: shade
openjdk · Aug 29, 2022 · 76c554a · 76c554a
1 parent d8d374a
commit 76c554a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/jol-core/src/main/java/org/openjdk/jol/info/GraphStatsWalker.java b/jol-core/src/main/java/org/openjdk/jol/info/GraphStatsWalker.java
@@ -67,6 +67,7 @@ public GraphStats walk(Object... roots) {
 
                 for (Object e : (Object[]) o) {
                     if (e != null && visited.add(e)) {
+                        data.addRecord(vm.sizeOf(e));
                         s.push(e);
                     }
                 }

diff --git a/jol-core/src/test/java/org/openjdk/jol/info/GraphStatsTest.java b/jol-core/src/test/java/org/openjdk/jol/info/GraphStatsTest.java
@@ -23,6 +23,14 @@ static class D {
         public D(D d) { this.d = d; }
     }
 
+    static class E {
+        private final A[] as;
+
+        E() {
+            as = new A[] { new A() };
+        }
+    }
+
     @Test
     public void basicCounts() {
         A a = new A();
@@ -85,4 +93,14 @@ public void compoundSizes() {
         }
     }
 
+    @Test
+    public void layoutAndStatsMatch() {
+        E e = new E();
+
+        GraphLayout layout = GraphLayout.parseInstance(e);
+        GraphStats stats = GraphStats.parseInstance(e);
+
+        Assert.assertEquals(layout.totalSize(), stats.totalSize());
+        Assert.assertEquals(layout.totalCount(), stats.totalCount());
+    }
 }