[GR-12597] Fix __getitem__ access with arbitrary keys for array-like foreign objects

PullRequest: graalpython/318

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_interop.py

@@ -258,3 +258,13 @@ def test_internal_languages_dont_eval():
             assert "internal language" in str(e)
 
         assert polyglot.eval(language="python", string="21 * 2") == 42
+
+    def test_non_index_array_access():
+        import java
+        try:
+            al = java.type("java.util.ArrayList")()
+            assert al.size() == al["size"]()
+        except IndexError:
+            assert False, "using __getitem__ to access keys of an array-like foreign object should work"
+        except NotImplementedError as e:
+            assert "host lookup is not allowed" in str(e)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/AccessForeignItemNodes.java

@@ -139,14 +139,18 @@ public Object doForeignObject(TruffleObject object, Object idx,
         }
 
         private Object readForeignValue(TruffleObject object, Object key, Node foreignRead, boolean indexed) {
-            Object index = indexed ? checkNumber(getIndexNode().executeObject(key)) : key;
+            Object index = key;
+            if (indexed) {
+                // getIndexNode() is branch profile
+                Object indexKey = getIndexNode().executeObject(key);
+                if (object instanceof Number || PTypeToForeignNode.isBoxed(object)) {
+                    index = indexKey;
+                }
+            }
             try {
                 return getToPythonNode().executeConvert(ForeignAccess.sendRead(foreignRead, object, getToForeignNode().executeConvert(index)));
             } catch (UnsupportedMessageException ex) {
                 throw raise(AttributeError, "%s instance has no attribute '__getitem__'", object);
-            } catch (IndexOutOfBoundsException ex) {
-                // TODO remove this; workaround for TRegex
-                throw raise(IndexError, "invalid index %s", index);
             } catch (UnknownIdentifierException ex) {
                 if (indexed) {
                     throw raise(IndexError, "invalid index %s", index);
@@ -156,13 +160,6 @@ private Object readForeignValue(TruffleObject object, Object key, Node foreignRe
             }
         }
 
-        private Object checkNumber(Object object) {
-            if (object instanceof Number || PTypeToForeignNode.isBoxed(object)) {
-                return object;
-            }
-            throw raiseIndexError();
-        }
-
         protected boolean isArray(TruffleObject o) {
             if (hasSizeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();