simplify InteropMap and InteropArray

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/interop/InteropArray.java

@@ -40,16 +40,15 @@
  */
 package com.oracle.graal.python.runtime.interop;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.MessageResolution;
 import com.oracle.truffle.api.interop.Resolve;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.nodes.Node;
 
-public class InteropArray implements TruffleObject {
-
-    private final Object[] array;
+public final class InteropArray implements TruffleObject {
+    @CompilationFinal(dimensions = 1) private final Object[] array;
 
     InteropArray(Object[] array) {
         this.array = array;
@@ -60,11 +59,11 @@ public ForeignAccess getForeignAccess() {
         return InteropArrayMRForeign.ACCESS;
     }
 
-    public Object getKeyAt(int pos) {
+    private Object get(int pos) {
         return array[pos];
     }
 
-    public int size() {
+    private int size() {
         return array.length;
     }
 
@@ -77,24 +76,25 @@ static class InteropArrayMR {
 
         @Resolve(message = "READ")
         abstract static class Read extends Node {
-            @TruffleBoundary
-            public Object access(InteropArray target, Number index) {
-                return target.getKeyAt(index.intValue());
+            Object access(InteropArray target, int index) {
+                return target.get(index);
+            }
+
+            Object access(InteropArray target, long index) {
+                return target.get((int) index);
             }
         }
 
         @Resolve(message = "HAS_SIZE")
         abstract static class HasSize extends Node {
-
-            public boolean access(@SuppressWarnings("unused") InteropArray target) {
+            boolean access(@SuppressWarnings("unused") InteropArray target) {
                 return true;
             }
         }
 
         @Resolve(message = "GET_SIZE")
         abstract static class GetSize extends Node {
-
-            public Object access(InteropArray target) {
+            int access(InteropArray target) {
                 return target.size();
             }
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/interop/InteropMap.java

@@ -58,57 +58,55 @@
  * A container class used to store per-node attributes used by the instrumentation framework.
  *
  */
-public class InteropMap implements TruffleObject {
+public final class InteropMap implements TruffleObject {
+    private final Map<String, Object> data;
 
-    private final Map<String, Object> data = new HashMap<>();
+    public InteropMap(Map<String, Object> data) {
+        this.data = data;
+    }
 
     @Override
     public ForeignAccess getForeignAccess() {
         return InteropMapMRForeign.ACCESS;
     }
 
     @TruffleBoundary
-    public void addProperty(String name, Object value) {
-        data.put(name, value);
-    }
-
-    @TruffleBoundary
-    public int size() {
+    private int size() {
         return data.size();
     }
 
     @TruffleBoundary
-    public Object getProperty(String name) {
-        assert hasProperty(name);
+    private Object getKey(String name) {
+        assert hasKey(name);
         return data.get(name);
     }
 
     @TruffleBoundary
-    public boolean hasProperty(String name) {
+    private boolean hasKey(String name) {
         return data.containsKey(name);
     }
 
     @TruffleBoundary
-    public TruffleObject getPropertyNames() {
+    private TruffleObject getKeys() {
         return new InteropArray(data.keySet().toArray());
     }
 
     @TruffleBoundary
     public static InteropMap fromPDict(PDict dict) {
-        InteropMap map = new InteropMap();
+        Map<String, Object> map = new HashMap<>();
         for (DictEntry s : dict.getDictStorage().entries()) {
-            map.addProperty(s.getKey().toString(), s.getValue());
+            map.put(s.getKey().toString(), s.getValue());
         }
-        return map;
+        return new InteropMap(map);
     }
 
     @TruffleBoundary
     public static InteropMap fromPythonObject(PythonObject globals) {
-        InteropMap map = new InteropMap();
+        Map<String, Object> map = new HashMap<>();
         for (String name : globals.getAttributeNames()) {
-            map.addProperty(name, globals.getAttribute(name));
+            map.put(name, globals.getAttribute(name));
         }
-        return map;
+        return new InteropMap(map);
     }
 
     static boolean isInstance(TruffleObject object) {
@@ -120,30 +118,29 @@ static class InteropMapMR {
 
         @Resolve(message = "READ")
         abstract static class Read extends Node {
-            public Object access(InteropMap target, String key) {
-                return target.getProperty(key);
+            Object access(InteropMap target, String key) {
+                return target.getKey(key);
             }
         }
 
         @Resolve(message = "HAS_KEYS")
         abstract static class HasKeys extends Node {
-
-            public Object access(@SuppressWarnings("unused") Object target) {
+            boolean access(@SuppressWarnings("unused") Object target) {
                 return true;
             }
         }
 
         @Resolve(message = "KEYS")
         abstract static class Keys extends Node {
-            public Object access(InteropMap target) {
-                return target.getPropertyNames();
+            Object access(InteropMap target) {
+                return target.getKeys();
             }
         }
 
         @Resolve(message = "KEY_INFO")
         abstract static class KeyInfoMR extends Node {
-            public Object access(InteropMap target, Object key) {
-                if (key instanceof String && target.hasProperty((String) key)) {
+            int access(InteropMap target, Object key) {
+                if (key instanceof String && target.hasKey((String) key)) {
                     return KeyInfo.READABLE;
                 } else {
                     return 0;