Move setSize() from ArrayHelpers to RubyArray

Author: andrykonchin

src/main/java/org/truffleruby/core/array/ArrayAppendManyNode.java

@@ -9,8 +9,6 @@
  */
 package org.truffleruby.core.array;
 
-import static org.truffleruby.core.array.ArrayHelpers.setSize;
-
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
 import org.truffleruby.language.RubyBaseNode;
 
@@ -56,7 +54,7 @@ RubyArray appendManySameType(RubyArray array, RubyArray other,
             array.setStoreAndSize(newStore, newSize);
         } else {
             otherStores.copyContents(otherStore, 0, store, oldSize, otherSize);
-            setSize(array, newSize);
+            array.setSize(newSize);
         }
         return array;
     }

src/main/java/org/truffleruby/core/array/ArrayAppendOneNode.java

@@ -9,8 +9,6 @@
  */
 package org.truffleruby.core.array;
 
-import static org.truffleruby.core.array.ArrayHelpers.setSize;
-
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.profiles.CountingConditionProfile;
@@ -63,7 +61,7 @@ RubyArray appendOneSameType(RubyArray array, Object value,
             array.setStoreAndSize(newStore, newSize);
         } else {
             stores.write(store, oldSize, value);
-            setSize(array, newSize);
+            array.setSize(newSize);
         }
         return array;
     }

src/main/java/org/truffleruby/core/array/ArrayHelpers.java

@@ -16,15 +16,6 @@
 
 public abstract class ArrayHelpers {
 
-    /** Sets the size of the given array
-     *
-     * Asserts that the size is valid for the current store of the array. If setting both size and store, use
-     * setStoreAndSize or be sure to setStore before setSize as this assertion may fail. */
-    public static void setSize(RubyArray array, int size) {
-        assert ArrayOperations.getStoreCapacity(array) >= size;
-        array.size = size;
-    }
-
     private static boolean assertValidElements(Object store, int size) {
         return !(store instanceof Object[]) || ArrayUtils.assertValidElements((Object[]) store, 0, size);
     }

src/main/java/org/truffleruby/core/array/ArrayNodes.java

@@ -9,7 +9,6 @@
  */
 package org.truffleruby.core.array;
 
-import static org.truffleruby.core.array.ArrayHelpers.setSize;
 import static org.truffleruby.language.dispatch.DispatchConfiguration.PUBLIC;
 
 import java.util.Arrays;
@@ -1708,7 +1707,7 @@ RubyArray popNotEmptyUnsharedStorage(RubyArray array, int n,
 
             // Remove the end from the original array.
             stores.clear(store, size - numPop, numPop);
-            setSize(array, size - numPop);
+            array.setSize(size - numPop);
 
             return createArray(popped, numPop);
         }

src/main/java/org/truffleruby/core/array/ArrayPopOneNode.java

@@ -9,8 +9,6 @@
  */
 package org.truffleruby.core.array;
 
-import static org.truffleruby.core.array.ArrayHelpers.setSize;
-
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
 import org.truffleruby.language.RubyBaseNode;
 
@@ -40,7 +38,7 @@ Object popOne(RubyArray array,
         final int size = array.size;
         final Object value = stores.read(store, size - 1);
         stores.clear(store, size - 1, 1);
-        setSize(array, size - 1);
+        array.setSize(size - 1);
         return value;
     }
 

src/main/java/org/truffleruby/core/array/ArrayWriteNormalizedNode.java

@@ -9,8 +9,6 @@
  */
 package org.truffleruby.core.array;
 
-import static org.truffleruby.core.array.ArrayHelpers.setSize;
-
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
@@ -124,7 +122,7 @@ Object writeBeyondObject(RubyArray array, int index, Object value,
             profileAndReportLoopCount(loopProfile, n - array.size);
         }
         newStores.write(newStore, index, value);
-        setSize(array, index + 1);
+        array.setSize(index + 1);
         return value;
     }
 

src/main/java/org/truffleruby/core/array/RubyArray.java

@@ -61,7 +61,16 @@ public void setStore(Object store) {
     public void setStoreAndSize(Object store, int size) {
         assert (store instanceof SharedArrayStorage) == (this.getShape().isShared());
         this.setStore(store);
-        ArrayHelpers.setSize(this, size);
+        setSize(size);
+    }
+
+    /** Sets the size of the given array
+     *
+     * Asserts that the size is valid for the current store of the array. If setting both size and store, use
+     * {@link #setStoreAndSize} or be sure to {@link #setStore} before {@link #setSize} as this assertion may fail. */
+    public void setSize(int size) {
+        assert ArrayOperations.getStoreCapacity(this) >= size;
+        this.size = size;
     }
 
     @TruffleBoundary