Fix blocklist violations.

Author: woess

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/Boundaries.java

@@ -238,6 +238,11 @@ public static ByteBuffer byteBufferSlice(ByteBuffer buf, int pos, int limit) {
         return buf.slice(pos, limit - pos);
     }
 
+    @TruffleBoundary(allowInlining = true)
+    public static void byteBufferGet(ByteBuffer src, int srcPos, byte[] dst, int dstPos, int length) {
+        src.get(srcPos, dst, dstPos, length);
+    }
+
     @TruffleBoundary(allowInlining = true)
     public static void byteBufferPutArray(ByteBuffer dst, int dstPos, byte[] src, int srcPos, int srcLength) {
         dst.put(dstPos, src, srcPos, srcLength);

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/JSArrayBufferObject.java

@@ -42,7 +42,6 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.Objects;
 
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -57,6 +56,7 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.TruffleString;
+import com.oracle.truffle.js.runtime.Boundaries;
 import com.oracle.truffle.js.runtime.Errors;
 import com.oracle.truffle.js.runtime.JSAgentWaiterList;
 import com.oracle.truffle.js.runtime.JSConfig;
@@ -166,21 +166,28 @@ long getBufferSize() {
 
         private void ensureNotDetached() throws IndexOutOfBoundsException {
             if (isDetached()) {
-                throw DetachedBufferIndexOutOfBoundsException.INSTANCE;
+                throw BufferIndexOutOfBoundsException.INSTANCE;
             }
         }
 
         @ExportMessage
         void readBuffer(long byteOffset, byte[] destination, int destinationOffset, int length) throws InvalidBufferOffsetException {
             try {
                 ensureNotDetached();
-                System.arraycopy(byteArray, Objects.checkFromIndexSize(Math.toIntExact(byteOffset), length, byteArray.length),
-                                destination, Objects.checkFromIndexSize(destinationOffset, length, destination.length), length);
+                System.arraycopy(byteArray, checkFromIndexSize(Math.toIntExact(byteOffset), length, byteArray.length),
+                                destination, checkFromIndexSize(destinationOffset, length, destination.length), length);
             } catch (IndexOutOfBoundsException | ArithmeticException e) {
                 throw InvalidBufferOffsetException.create(byteOffset, length);
             }
         }
 
+        private static int checkFromIndexSize(int fromIndex, int size, int length) {
+            if ((length | fromIndex | size) < 0 || size > length - fromIndex) {
+                throw BufferIndexOutOfBoundsException.INSTANCE;
+            }
+            return fromIndex;
+        }
+
         @ExportMessage
         byte readBufferByte(long byteOffset) throws InvalidBufferOffsetException {
             try {
@@ -345,15 +352,15 @@ final long getBufferSize() {
 
         private void ensureNotDetached() {
             if (isDetached()) {
-                throw DetachedBufferIndexOutOfBoundsException.INSTANCE;
+                throw BufferIndexOutOfBoundsException.INSTANCE;
             }
         }
 
         @ExportMessage
         final void readBuffer(long byteOffset, byte[] destination, int destinationOffset, int length) throws InvalidBufferOffsetException {
             try {
                 ensureNotDetached();
-                byteBuffer.get(Math.toIntExact(byteOffset), destination, destinationOffset, length);
+                Boundaries.byteBufferGet(byteBuffer, Math.toIntExact(byteOffset), destination, destinationOffset, length);
             } catch (IndexOutOfBoundsException | ArithmeticException e) {
                 throw InvalidBufferOffsetException.create(byteOffset, length);
             }
@@ -768,10 +775,10 @@ public static JSArrayBufferObject createInteropArrayBuffer(Shape shape, JSDynami
     }
 
     @SuppressWarnings("serial")
-    static final class DetachedBufferIndexOutOfBoundsException extends IndexOutOfBoundsException {
-        private static final IndexOutOfBoundsException INSTANCE = new DetachedBufferIndexOutOfBoundsException();
+    static final class BufferIndexOutOfBoundsException extends IndexOutOfBoundsException {
+        private static final IndexOutOfBoundsException INSTANCE = new BufferIndexOutOfBoundsException();
 
-        private DetachedBufferIndexOutOfBoundsException() {
+        private BufferIndexOutOfBoundsException() {
         }
 
         @SuppressWarnings("sync-override")

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/node/ArrayBufferGetContentsNode.java

@@ -52,6 +52,7 @@
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.js.nodes.JavaScriptBaseNode;
+import com.oracle.truffle.js.runtime.Boundaries;
 import com.oracle.truffle.js.runtime.Errors;
 import com.oracle.truffle.js.runtime.JSConfig;
 import com.oracle.truffle.js.runtime.util.DirectByteBufferHelper;
@@ -84,7 +85,7 @@ protected ByteBuffer doInteropBuffer(Object buffer,
                 int remaining = bufferSize - i;
                 int copyLength = Math.min(copyBufferSize, remaining);
                 interop.readBuffer(buffer, i, copyBuffer, 0, copyLength);
-                byteBuffer.put(i, copyBuffer, 0, copyLength);
+                Boundaries.byteBufferPutArray(byteBuffer, i, copyBuffer, 0, copyLength);
             }
             LoopNode.reportLoopCount(this, bufferSize);
             return byteBuffer;