Code cleanup.

Author: aardvark179

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

@@ -178,10 +178,6 @@ public BuilderState start(int length) {
                 return new BuilderState(allocator.allocate(length), length);
             }
         }
-
-        public BuilderState share(BuilderState state) {
-            return state;
-        }
     }
 
     @ImportStatic(ArrayGuards.class)

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

@@ -52,10 +52,7 @@ protected void noop(Object dstStore, Object srcStore, int dstStart, int srcStart
             guards = "!noopGuard(dstStore, srcStore, dstStart, srcStart, length)",
             limit = "storageStrategyLimit()")
     protected void copy(Object dstStore, Object srcStore, int dstStart, int srcStart, int length,
-            @CachedLibrary("srcStore") ArrayStoreLibrary stores,
-            @Cached WriteBarrierNode writeBarrierNode,
-            @Cached ConditionProfile share,
-            @Cached LoopConditionProfile loopProfile) {
+            @CachedLibrary("srcStore") ArrayStoreLibrary stores) {
 
         stores.copyContents(srcStore, srcStart, dstStore, dstStart, length);
     }

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

@@ -10,6 +10,7 @@
 package org.truffleruby.core.array;
 
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.array.library.ZeroLengthArrayStore;
 
 public class ArrayGuards {
 
@@ -36,4 +37,8 @@ public static boolean basicStore(Object store) {
         return store instanceof int[] || store instanceof long[] || store instanceof double[] ||
                 store instanceof Object[];
     }
+
+    public static boolean zeroLengthStore(Object store) {
+        return store == ZeroLengthArrayStore.ZERO_LENGTH_STORE;
+    }
 }

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

@@ -1172,7 +1172,8 @@ protected abstract RubyArray executeInitialize(RubyArray array, Object size, Obj
         protected RubyArray initializeNoArgs(RubyArray array, NotProvided size, NotProvided fillingValue, Nil block,
                 @Cached IsSharedNode isSharedNode,
                 @Cached ConditionProfile sharedProfile) {
-            setStoreAndSize(array, ArrayStoreLibrary.initialStorage(sharedProfile.profile(isSharedNode.executeIsShared(array))), 0);
+            setStoreAndSize(array,
+                    ArrayStoreLibrary.initialStorage(sharedProfile.profile(isSharedNode.executeIsShared(array))), 0);
             return array;
         }
 
@@ -1181,7 +1182,8 @@ protected RubyArray initializeOnlyBlock(
                 RubyArray array, NotProvided size, NotProvided fillingValue, RubyProc block,
                 @Cached IsSharedNode isShared,
                 @Cached ConditionProfile sharedProfile) {
-            setStoreAndSize(array, ArrayStoreLibrary.initialStorage(sharedProfile.profile(isShared.executeIsShared(array))), 0);
+            setStoreAndSize(array,
+                    ArrayStoreLibrary.initialStorage(sharedProfile.profile(isShared.executeIsShared(array))), 0);
             return array;
         }
 

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

@@ -105,7 +105,7 @@ public static ArrayAllocator initialAllocator(boolean shared) {
     /** Return whether {@code store} and {@code other} share the same underlying array storage. */
     public abstract boolean isSameStorage(Object store, Object other);
 
-    /** Return the underlying storage used by this array, which may be behind multiple warppers. Stores which wrap some
+    /** Return the underlying storage used by this array, which may be behind multiple wrappers. Stores which wrap some
      * array store should always recursively unwrap that store using this same library call. */
     public Object backingStore(Object store) {
         return store;
@@ -154,7 +154,7 @@ public Object extractRange(Object store, int start, int end) {
      * elements, so that that range does not retain references to objects/memory/resources. This can be understood as
      * "nulling out" that part of the array, and will do nothing for primitive arrays. */
     public void clear(Object store, int start, int length) {
-        throw CompilerDirectives.shouldNotReachHere();
+        throw new UnsupportedOperationException("clear operation not supported");
     }
 
     /** Fill the part of the array starting at {@code start} and extending for {@code length} elements using

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

@@ -211,6 +211,8 @@ 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;

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

@@ -64,7 +64,7 @@ protected static boolean acceptsDelegateValues(double[] store, DelegatedArraySto
         }
 
         @Specialization
-        protected static boolean acceptsDelegateValues(double[] store, SharedArrayStorage otherStore,
+        protected static boolean acceptsSharedValues(double[] store, SharedArrayStorage otherStore,
                 @CachedLibrary("store") ArrayStoreLibrary stores) {
             return stores.acceptsAllValues(store, otherStore.storage);
         }
@@ -310,7 +310,8 @@ protected static Object allocate(double[] store, Object[] newStore, int length)
             return ObjectArrayStore.OBJECT_ARRAY_ALLOCATOR.allocate(length);
         }
 
-        @Specialization(guards = "!basicStore(newStore)", limit = "storageStrategyLimit()")
+        @Specialization(guards = { "!basicStore(newStore)", "!zeroLengthStore(newStore)" },
+                limit = "storageStrategyLimit()")
         protected static Object allocate(double[] store, Object newStore, int length,
                 @CachedLibrary("newStore") ArrayStoreLibrary newStores) {
             return newStores.allocateForNewStore(newStore, store, length);

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

@@ -64,7 +64,7 @@ protected static boolean acceptsDelegateValues(int[] store, DelegatedArrayStorag
         }
 
         @Specialization
-        protected static boolean acceptsDelegateValues(int[] store, SharedArrayStorage otherStore,
+        protected static boolean acceptsSharedValues(int[] store, SharedArrayStorage otherStore,
                 @CachedLibrary("store") ArrayStoreLibrary stores) {
             return stores.acceptsAllValues(store, otherStore.storage);
         }
@@ -330,7 +330,8 @@ protected static Object allocate(int[] store, Object[] newStore, int length) {
             return ObjectArrayStore.OBJECT_ARRAY_ALLOCATOR.allocate(length);
         }
 
-        @Specialization(guards = "!basicStore(newStore)", limit = "storageStrategyLimit()")
+        @Specialization(guards = { "!basicStore(newStore)", "!zeroLengthStore(newStore)" },
+                limit = "storageStrategyLimit()")
         protected static Object allocate(int[] store, Object newStore, int length,
                 @CachedLibrary("newStore") ArrayStoreLibrary newStores) {
             return newStores.allocateForNewStore(newStore, store, length);

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

@@ -69,7 +69,7 @@ protected static boolean acceptsDelegateValues(long[] store, DelegatedArrayStora
         }
 
         @Specialization
-        protected static boolean acceptsDelegateValues(long[] store, SharedArrayStorage otherStore,
+        protected static boolean acceptsSharedValues(long[] store, SharedArrayStorage otherStore,
                 @CachedLibrary("store") ArrayStoreLibrary stores) {
             return stores.acceptsAllValues(store, otherStore.storage);
         }
@@ -350,7 +350,8 @@ protected static Object allocate(long[] store, Object[] newStore, int length) {
             return ObjectArrayStore.OBJECT_ARRAY_ALLOCATOR.allocate(length);
         }
 
-        @Specialization(guards = "!basicStore(newStore)", limit = "storageStrategyLimit()")
+        @Specialization(guards = { "!basicStore(newStore)", "!zeroLengthStore(newStore)" },
+                limit = "storageStrategyLimit()")
         protected static Object allocate(long[] store, Object newStore, int length,
                 @CachedLibrary("newStore") ArrayStoreLibrary newStores) {
             return newStores.allocateForNewValue(newStore, store, length);

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

@@ -187,7 +187,7 @@ protected static void shareElements(NativeArrayStorage store,
                 @Cached WriteBarrierNode writeBarrierNode) {
             int i = 0;
             try {
-                for (; i < store.length; i++) {
+                for (; loopProfile.inject(i < store.length); i++) {
                     writeBarrierNode.executeWriteBarrier(node.read(store, i));
                 }
             } finally {