test/hotspot/jtreg/vmTestbase/nsk/share/gc/tree/TreeNode.java

@@ -46,13 +46,19 @@
           *
           * @param memory memory
           */
          public TreeNode(long memory) {
                  int length = (int) (memory - (4 * 2 + 2 * Memory.getReferenceSize() + Memory.getObjectExtraSize()));
-                 if (length > 0)
-                         storage = new byte[length];
                  size = length;
+                 if (length <= 0) {
+                     return;
+                 }
+                 if (Memory.isValhallaEnabled()) {
+                     storage = new Integer[Memory.getArrayLength(memory, Memory.getIntegerArrayElementSize())];
+                 } else {
+                     storage = new int[Memory.getArrayLength(memory, Memory.getIntSize())];
+                 }
          }
  
          /**
           * Create a tree node that will occupy approximately given memory.
           *