[GR-17457] Use unsharedAllocator() in places which do not reassign the RubyArray store

PullRequest: truffleruby/3459

Author: eregon

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

@@ -202,7 +202,7 @@ protected void appendCompatibleType(BuilderState state, int index, Object value,
                 final int capacity = ArrayUtils.capacityForOneMore(getLanguage(), length);
                 state.store = arrays.expand(state.store, capacity);
                 state.capacity = capacity;
-                replaceNodes(arrays.allocator(state.store), capacity);
+                replaceNodes(arrays.unsharedAllocator(state.store), capacity);
             }
             arrays.write(state.store, index, value);
             state.nextIndex++;
@@ -264,7 +264,7 @@ protected void appendCompatibleStrategy(BuilderState state, int index, RubyArray
             int length = arrays.capacity(state.store);
             if (neededSize > length) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                replaceNodes(arrays.allocator(state.store), neededSize);
+                replaceNodes(arrays.unsharedAllocator(state.store), neededSize);
                 final int capacity = ArrayUtils.capacity(getLanguage(), length, neededSize);
                 state.store = arrays.expand(state.store, capacity);
                 state.capacity = capacity;

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

@@ -1930,7 +1930,7 @@ protected RubyArray rotate(RubyArray array, int rotation,
             rotation = rotationProfile.profile(rotation);
             assert 0 < rotation && rotation < size;
 
-            final Object rotated = stores.allocator(store).allocate(size);
+            final Object rotated = stores.unsharedAllocator(store).allocate(size);
             rotateArrayCopy(rotation, size, stores, store, rotated);
             return createArray(rotated, size);
         }
@@ -2230,7 +2230,7 @@ protected Object sortPrimitiveArrayNoBlock(RubyArray array, Nil block,
                 @CachedLibrary(limit = "1") ArrayStoreLibrary mutableStores,
                 @Cached IntValueProfile arraySizeProfile) {
             final int size = arraySizeProfile.profile(array.size);
-            Object newStore = stores.allocator(store).allocate(size);
+            Object newStore = stores.unsharedAllocator(store).allocate(size);
             stores.copyContents(store, 0, newStore, 0, size);
             mutableStores.sort(newStore, size);
             return createArray(newStore, size);

src/main/java/org/truffleruby/core/array/library/ArrayStoreLibrary.java

@@ -220,7 +220,8 @@ public Object unsharedAllocateForNewStore(Object store, Object newStore, int len
         return allocateForNewStore(store, newStore, length);
     }
 
-    /** Return an allocator for a mutable version of {@code store}. */
+    /** Return an allocator for a mutable version of {@code store}. Only use this if the new store is reassigned to the
+     * same RubyArray. Otherwise, {@link #unsharedAllocator(Object)} should be used. */
     public abstract ArrayAllocator allocator(Object store);
 
     /** Return an allocator for a mutable, unshared version of {@code store}. */

src/main/java/org/truffleruby/core/array/library/DelegatedArrayStorage.java

@@ -31,12 +31,23 @@
 @ExportLibrary(ArrayStoreLibrary.class)
 @GenerateUncached
 @ImportStatic(ArrayGuards.class)
-public class DelegatedArrayStorage implements ObjectGraphNode {
+public final class DelegatedArrayStorage implements ObjectGraphNode {
 
     public final Object storage;
     public final int offset;
     public final int length;
 
+    public DelegatedArrayStorage(Object storage, int offset, int length) {
+        assert offset >= 0;
+        assert length >= 0;
+        assert !(storage instanceof DelegatedArrayStorage);
+        assert !(storage instanceof NativeArrayStorage);
+        assert !(storage instanceof SharedArrayStorage);
+        this.storage = storage;
+        this.offset = offset;
+        this.length = length;
+    }
+
     @ExportMessage
     protected static boolean accepts(DelegatedArrayStorage store,
             @CachedLibrary(limit = "1") ArrayStoreLibrary backingStores) {
@@ -126,7 +137,7 @@ protected void clear(int start, int length) {
     @ExportMessage
     protected Object toJavaArrayCopy(int length,
             @CachedLibrary(limit = "1") ArrayStoreLibrary stores) {
-        Object newStore = stores.allocator(storage).allocate(length);
+        Object newStore = stores.unsharedAllocator(storage).allocate(length);
         stores.copyContents(storage, offset, newStore, 0, length);
         return newStore;
     }
@@ -182,18 +193,7 @@ protected boolean isDefaultValue(Object value,
     @ExportMessage
     protected ArrayAllocator allocator(
             @CachedLibrary(limit = "1") ArrayStoreLibrary stores) {
-        return stores.allocator(storage);
-    }
-
-    public DelegatedArrayStorage(Object storage, int offset, int length) {
-        assert offset >= 0;
-        assert length >= 0;
-        assert !(storage instanceof DelegatedArrayStorage);
-        assert !(storage instanceof NativeArrayStorage);
-        assert !(storage instanceof SharedArrayStorage);
-        this.storage = storage;
-        this.offset = offset;
-        this.length = length;
+        return stores.unsharedAllocator(storage);
     }
 
     public boolean hasObjectArrayStorage() {
@@ -214,8 +214,4 @@ public void getAdjacentObjects(Set<Object> reachable) {
         }
     }
 
-    public boolean isEquivalentTo(DelegatedArrayStorage other) {
-        return storage == other.storage && offset == other.offset && length == other.length;
-    }
-
 }

src/main/java/org/truffleruby/core/array/library/SharedArrayStorage.java

@@ -36,7 +36,7 @@
 @ExportLibrary(ArrayStoreLibrary.class)
 @GenerateUncached
 @ImportStatic(ArrayGuards.class)
-public class SharedArrayStorage implements ObjectGraphNode {
+public final class SharedArrayStorage implements ObjectGraphNode {
 
     public final Object storage;
 
@@ -242,13 +242,13 @@ protected Iterable<Object> getIterable(int from, int length,
     @ExportMessage
     protected ArrayAllocator generalizeForValue(Object newValue,
             @CachedLibrary(limit = "1") ArrayStoreLibrary stores) {
-        return new SharedArrayAllocator(stores.generalizeForValue(storage, newValue));
+        return stores.generalizeForValue(storage, newValue);
     }
 
     @ExportMessage
     protected ArrayAllocator generalizeForStore(Object newStore,
             @CachedLibrary(limit = "1") ArrayStoreLibrary stores) {
-        return new SharedArrayAllocator(stores.generalizeForStore(newStore, storage));
+        return stores.generalizeForStore(newStore, storage);
     }
 
     @ExportMessage
@@ -284,13 +284,13 @@ protected boolean isDefaultValue(Object value,
     @ExportMessage
     protected ArrayAllocator allocator(
             @CachedLibrary(limit = "1") ArrayStoreLibrary stores) {
-        return new SharedArrayAllocator(stores.allocator(storage));
+        return new SharedArrayAllocator(stores.unsharedAllocator(storage));
     }
 
     @ExportMessage
     protected ArrayAllocator unsharedAllocator(
             @CachedLibrary(limit = "1") ArrayStoreLibrary stores) {
-        return stores.allocator(storage);
+        return stores.unsharedAllocator(storage);
     }
 
     public boolean hasObjectArrayStorage() {