Avoid dispatched libraries in ArrayStoreLibrary exports

eregon · eregon · commit 9309f12ca08f · 2023-04-20T13:17:33.000+02:00
diff --git a/src/main/java/org/truffleruby/core/array/library/DelegatedArrayStorage.java b/src/main/java/org/truffleruby/core/array/library/DelegatedArrayStorage.java
@@ -113,12 +113,12 @@ protected Object[] boxedCopyOfRange(int start, int length,
         return stores.boxedCopyOfRange(storage, offset + start, length);
     }
 
-    @ExportMessage
+    @ExportMessage(limit = "storageStrategyLimit()")
     protected void copyContents(int srcStart, Object destStore, int destStart, int length,
             @CachedLibrary("this") ArrayStoreLibrary node,
             @Cached LoopConditionProfile loopProfile,
             @CachedLibrary("this.storage") ArrayStoreLibrary srcStores,
-            @CachedLibrary(limit = "storageStrategyLimit()") ArrayStoreLibrary destStores) {
+            @CachedLibrary("destStore") ArrayStoreLibrary destStores) {
         int i = 0;
         try {
             for (; loopProfile.inject(i < length); i++) {
diff --git a/src/main/java/org/truffleruby/core/array/library/NativeArrayStorage.java b/src/main/java/org/truffleruby/core/array/library/NativeArrayStorage.java
@@ -171,11 +171,11 @@ protected static void shareElements(NativeArrayStorage store, int start, int end
         }
     }
 
-    @ExportMessage
+    @ExportMessage(limit = "storageStrategyLimit()")
     protected void copyContents(int srcStart, Object destStore, int destStart, int length,
             @CachedLibrary("this") ArrayStoreLibrary srcStores,
             @Cached @Exclusive LoopConditionProfile loopProfile,
-            @CachedLibrary(limit = "storageStrategyLimit()") ArrayStoreLibrary destStores) {
+            @CachedLibrary("destStore") ArrayStoreLibrary destStores) {
         int i = 0;
         try {
             for (; loopProfile.inject(i < length); i++) {

Original file line number	Diff line number	Diff line change
`@@ -171,11 +171,11 @@ protected static void shareElements(NativeArrayStorage store, int start, int end`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`174`		`- @ExportMessage`
	`174`	`+ @ExportMessage(limit = "storageStrategyLimit()")`
`175`	`175`	`protected void copyContents(int srcStart, Object destStore, int destStart, int length,`
`176`	`176`	`@CachedLibrary("this") ArrayStoreLibrary srcStores,`
`177`	`177`	`@Cached @Exclusive LoopConditionProfile loopProfile,`
`178`		`- @CachedLibrary(limit = "storageStrategyLimit()") ArrayStoreLibrary destStores) {`
	`178`	`+ @CachedLibrary("destStore") ArrayStoreLibrary destStores) {`
`179`	`179`	`int i = 0;`
`180`	`180`	`try {`
`181`	`181`	`for (; loopProfile.inject(i < length); i++) {`