Add a couple more assertions,fixes, and tests for extracted ranges.

Author: aardvark179

spec/truffle/thread_safe_objects_spec.rb

@@ -191,6 +191,40 @@ def wb; @wb; end
     ary.each { |e| shared?(e).should == true }
   end
 
+  it "Array#shift(n) with copy-on-write DelegatedArrayStorage" do
+    ary = [Object.new, Object.new, Object.new, Object.new, Object.new]
+    @share = ary
+    new_ary = ary.shift(3)
+    shared?(ary).should == true
+    ary.each { |e| shared?(e).should == true }
+
+    shared?(new_ary).should == false
+    new_ary.each { |e| shared?(e).should == true }
+  end
+
+  it "Array#pop with copy-on-write DelegatedArrayStorage" do
+    ary = [Object.new, Object.new, Object.new]
+    ary.pop
+    @share = ary
+    shared?(ary).should == true
+    ary.each { |e| shared?(e).should == true }
+
+    wb = Object.new
+    ary[0] = wb
+    ary.each { |e| shared?(e).should == true }
+  end
+
+  it "Array#pop(n) with copy-on-write DelegatedArrayStorage" do
+    ary = [Object.new, Object.new, Object.new, Object.new, Object.new]
+    @share = ary
+    new_ary = ary.pop(3)
+    shared?(ary).should == true
+    ary.each { |e| shared?(e).should == true }
+
+    shared?(new_ary).should == false
+    new_ary.each { |e| shared?(e).should == true }
+  end
+
   it "Hash" do
     initial = Object.new
     hsh = { initial => Object.new }

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

@@ -37,6 +37,7 @@ private static boolean assertValidElements(Object store, int size) {
 
     public static RubyArray createArray(RubyContext context, RubyLanguage language, Object store, int size) {
         assert !(store instanceof Object[]) || store.getClass() == Object[].class;
+        assert !(store instanceof SharedArrayStorage);
         assert assertValidElements(store, size);
         return new RubyArray(context.getCoreLibrary().arrayClass, language.arrayShape, store, size);
     }

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

@@ -1703,7 +1703,7 @@ protected RubyArray popNotEmptySharedStorage(RubyArray array, int n,
             final int size = arraySizeProfile.profile(array.size);
             final int numPop = minProfile.profile(size < n) ? size : n;
 
-            final Object popped = stores.extractRange(store, size - numPop, size); // copy on write
+            final Object popped = stores.extractRangeAndUnshare(store, size - numPop, size); // copy on write
             final Object prefix = stores.extractRange(store, 0, size - numPop);    // copy on write
             // NOTE(norswap): if one of these two arrays outlives the other, you get a memory leak
 
@@ -2168,9 +2168,9 @@ protected Object shiftMany(RubyArray array, int n,
                 @Cached ConditionProfile minProfile) {
             final int size = array.size;
             final int numShift = minProfile.profile(size < n) ? size : n;
-            final Object result = stores.extractRange(store, 0, numShift);
-            array.store = stores.extractRange(store, numShift, size);
-            setSize(array, size - numShift);
+            final Object result = stores.extractRangeAndUnshare(store, 0, numShift);
+            final Object newStore = stores.extractRange(store, numShift, size);
+            setStoreAndSize(array, newStore, size - numShift);
             return createArray(result, numShift);
         }