[GR-35145] Small fixes for shared array strategy.

PullRequest: truffleruby/3443

Author: eregon

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

@@ -1247,7 +1247,7 @@ protected Object initializeBlock(RubyArray array, int size, Object unusedFilling
                 profileAndReportLoopCount(loopProfile, n);
                 Object store = arrayBuilder.finish(state, n);
                 if (sharedProfile.profile(isSharedNode.executeIsShared(array))) {
-                    store = stores.makeShared(store);
+                    store = stores.makeShared(store, n);
                 }
                 setStoreAndSize(array, store, n);
             }
@@ -1907,7 +1907,7 @@ protected RubyArray replace(RubyArray array, RubyArray other,
             final int size = other.size;
             Object store = cowNode.execute(other, 0, size);
             if (sharedProfile.profile(isSharedNode.executeIsShared(array))) {
-                store = stores.makeShared(store);
+                store = stores.makeShared(store, size);
             }
             setStoreAndSize(array, store, size);
             return array;

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

@@ -122,7 +122,7 @@ public Object backingStore(Object store) {
     }
 
     /** Return a store that can be shared across threads. */
-    public Object makeShared(Object store) {
+    public Object makeShared(Object store, int size) {
         return new SharedArrayStorage(store);
     }
 

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

@@ -62,9 +62,9 @@ public Object backingStore(
     }
 
     @ExportMessage
-    protected Object makeShared(
+    protected Object makeShared(int size,
             @CachedLibrary(limit = "1") ArrayStoreLibrary stores) {
-        stores.shareElements(this, 0, length);
+        stores.shareElements(this, 0, size);
         return new SharedArrayStorage(this);
     }
 

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

@@ -143,9 +143,9 @@ protected Object[] boxedCopyOfRange(int start, int length,
     }
 
     @ExportMessage
-    protected static Object makeShared(NativeArrayStorage store,
+    protected static Object makeShared(NativeArrayStorage store, int size,
             @CachedLibrary("store") ArrayStoreLibrary stores) {
-        stores.shareElements(store, 0, stores.capacity(store));
+        stores.shareElements(store, 0, size);
         return new SharedArrayStorage(store);
     }
 

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

@@ -82,9 +82,9 @@ protected static Object[] boxedCopyOfRange(Object[] store, int start, int length
     }
 
     @ExportMessage
-    protected static Object makeShared(Object[] store,
+    protected static Object makeShared(Object[] store, int size,
             @CachedLibrary("store") ArrayStoreLibrary stores) {
-        stores.shareElements(store, 0, stores.capacity(store));
+        stores.shareElements(store, 0, size);
         return new SharedArrayStorage(store);
     }
 

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

@@ -49,18 +49,18 @@ public SharedArrayStorage(Object storage) {
      * stack of adjacent objects have been shared, which may not be true at the point the storage is converted to shared
      * storage. */
     @TruffleBoundary
-    public boolean allElementsShared() {
+    public boolean allElementsShared(int size) {
         if (storage == null || storage instanceof ZeroLengthArrayStore) {
             return true;
         }
         ArrayStoreLibrary stores = ArrayStoreLibrary.getFactory()
                 .getUncached(storage);
-        var elements = stores.getIterable(storage, 0, stores.capacity(storage));
+        var elements = stores.getIterable(storage, 0, size);
         for (var e : elements) {
             if (e == null || !(e instanceof RubyDynamicObject) || SharedObjects.isShared(e)) {
                 continue;
             } else {
-                System.err.printf("Unshared element %s.\n", e);
+                assert false : String.format("Unshared element %s.\n", e);
                 return false;
             }
         }
@@ -142,7 +142,7 @@ public Object backingStore(
     }
 
     @ExportMessage
-    public Object makeShared() {
+    public Object makeShared(int size) {
         return this;
     }
 

src/main/java/org/truffleruby/language/objects/shared/ShareInternalFieldsNode.java

@@ -47,7 +47,7 @@ public ShareInternalFieldsNode(int depth) {
     protected void shareArray(RubyArray array,
             @Bind("array.getStore()") Object store,
             @CachedLibrary("store") ArrayStoreLibrary stores) {
-        array.setStore(stores.makeShared(store));
+        array.setStore(stores.makeShared(store, array.size));
     }
 
     @Specialization

src/main/java/org/truffleruby/language/objects/shared/SharedObjects.java

@@ -143,7 +143,7 @@ public static void writeBarrier(RubyLanguage language, Object value) {
     private static boolean validateArray(RubyArray value) {
         Object storage = value.getStore();
         assert storage instanceof SharedArrayStorage;
-        return ((SharedArrayStorage) storage).allElementsShared();
+        return ((SharedArrayStorage) storage).allElementsShared(value.size);
     }
 
     public static void propagate(RubyLanguage language, RubyDynamicObject source, Object value) {
@@ -172,7 +172,7 @@ public static void onShareHook(RubyDynamicObject object) {
             DynamicObjectLibrary.getUncached().markShared(classVariables);
         } else if (object instanceof RubyArray) {
             RubyArray array = (RubyArray) object;
-            array.setStore(ArrayStoreLibrary.getFactory().getUncached().makeShared(array.getStore()));
+            array.setStore(ArrayStoreLibrary.getFactory().getUncached().makeShared(array.getStore(), array.size));
         }
     }