[GR-10823] Specialize array access in Java interop.

PullRequest: graal/1822

Author: rschatz

truffle/src/com.oracle.truffle.api.interop.java/src/com/oracle/truffle/api/interop/java/ArrayReadNode.java

@@ -24,7 +24,6 @@
  */
 package com.oracle.truffle.api.interop.java;
 
-import java.lang.reflect.Array;
 import java.util.List;
 
 import com.oracle.truffle.api.CompilerDirectives;
@@ -34,11 +33,64 @@
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.interop.java.ArrayReadNodeGen.ArrayGetNodeGen;
 import com.oracle.truffle.api.nodes.Node;
 
 @SuppressWarnings("deprecation")
 abstract class ArrayReadNode extends Node {
 
+    abstract static class ArrayGet extends Node {
+
+        protected abstract Object execute(Object array, int index);
+
+        @Specialization
+        boolean doBoolean(boolean[] array, int index) {
+            return array[index];
+        }
+
+        @Specialization
+        byte doByte(byte[] array, int index) {
+            return array[index];
+        }
+
+        @Specialization
+        short doShort(short[] array, int index) {
+            return array[index];
+        }
+
+        @Specialization
+        char doChar(char[] array, int index) {
+            return array[index];
+        }
+
+        @Specialization
+        int doInt(int[] array, int index) {
+            return array[index];
+        }
+
+        @Specialization
+        long doLong(long[] array, int index) {
+            return array[index];
+        }
+
+        @Specialization
+        float doFloat(float[] array, int index) {
+            return array[index];
+        }
+
+        @Specialization
+        double doDouble(double[] array, int index) {
+            return array[index];
+        }
+
+        @Specialization
+        Object doObject(Object[] array, int index) {
+            return array[index];
+        }
+    }
+
+    @Child private ArrayGet arrayGet = ArrayGetNodeGen.create();
+
     protected abstract Object executeWithTarget(JavaObject receiver, Object index);
 
     @Specialization(guards = {"receiver.isArray()"})
@@ -81,12 +133,12 @@ protected static Object notArray(JavaObject receiver, Number index) {
         throw UnsupportedMessageException.raise(Message.READ);
     }
 
-    private static Object doArrayAccess(JavaObject object, int index) {
+    private Object doArrayAccess(JavaObject object, int index) {
         Object obj = object.obj;
         assert object.isArray();
         Object val = null;
         try {
-            val = Array.get(obj, index);
+            val = arrayGet.execute(obj, index);
         } catch (ArrayIndexOutOfBoundsException outOfBounds) {
             CompilerDirectives.transferToInterpreter();
             throw UnknownIdentifierException.raise(String.valueOf(index));

truffle/src/com.oracle.truffle.api.interop.java/src/com/oracle/truffle/api/interop/java/ArrayWriteNode.java

@@ -24,7 +24,6 @@
  */
 package com.oracle.truffle.api.interop.java;
 
-import java.lang.reflect.Array;
 import java.util.List;
 
 import com.oracle.truffle.api.CompilerDirectives;
@@ -34,10 +33,63 @@
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.interop.java.ArrayWriteNodeGen.ArraySetNodeGen;
 import com.oracle.truffle.api.nodes.Node;
 
 abstract class ArrayWriteNode extends Node {
+
+    abstract static class ArraySet extends Node {
+
+        protected abstract void execute(Object array, int index, Object value);
+
+        @Specialization
+        void doBoolean(boolean[] array, int index, boolean value) {
+            array[index] = value;
+        }
+
+        @Specialization
+        void doByte(byte[] array, int index, byte value) {
+            array[index] = value;
+        }
+
+        @Specialization
+        void doShort(short[] array, int index, short value) {
+            array[index] = value;
+        }
+
+        @Specialization
+        void doChar(char[] array, int index, char value) {
+            array[index] = value;
+        }
+
+        @Specialization
+        void doInt(int[] array, int index, int value) {
+            array[index] = value;
+        }
+
+        @Specialization
+        void doLong(long[] array, int index, long value) {
+            array[index] = value;
+        }
+
+        @Specialization
+        void doFloat(float[] array, int index, float value) {
+            array[index] = value;
+        }
+
+        @Specialization
+        void doDouble(double[] array, int index, double value) {
+            array[index] = value;
+        }
+
+        @Specialization
+        void doObject(Object[] array, int index, Object value) {
+            array[index] = value;
+        }
+    }
+
     @Child private ToJavaNode toJavaNode = ToJavaNode.create();
+    @Child private ArraySet arraySet = ArraySetNodeGen.create();
 
     protected abstract Object executeWithTarget(JavaObject receiver, Object index, Object value);
 
@@ -94,7 +146,7 @@ private Object doArrayAccess(JavaObject receiver, int index, Object value) {
         assert receiver.isArray();
         final Object javaValue = toJavaNode.execute(value, obj.getClass().getComponentType(), null, receiver.languageContext);
         try {
-            Array.set(obj, index, javaValue);
+            arraySet.execute(obj, index, javaValue);
         } catch (ArrayIndexOutOfBoundsException outOfBounds) {
             CompilerDirectives.transferToInterpreter();
             throw UnknownIdentifierException.raise(String.valueOf(index));

vm/mx.vm/suite.py

@@ -68,7 +68,7 @@
             },
             {
                 "name": "sulong",
-                "version": "82898b4c1b17965b468038a7cd798f59436e1d6b",
+                "version": "0999f49991c1777791fb3a49ad4f76b462a72273",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/sulong.git", "kind": "git"},