[GR-24336] Don't report generic iterables as arrays

PullRequest: graalpython/1058

Author: msimacek

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java

@@ -52,15 +52,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.oracle.graal.python.runtime.interop.InteropArray;
-import com.oracle.graal.python.test.PythonTests;
-import com.oracle.truffle.api.interop.ArityException;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.TruffleObject;
-import com.oracle.truffle.api.interop.UnknownIdentifierException;
-import com.oracle.truffle.api.library.ExportLibrary;
-import com.oracle.truffle.api.library.ExportMessage;
-
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Context.Builder;
 import org.graalvm.polyglot.Engine;
@@ -76,6 +67,15 @@
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
+import com.oracle.graal.python.runtime.interop.InteropArray;
+import com.oracle.graal.python.test.PythonTests;
+import com.oracle.truffle.api.interop.ArityException;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+
 @RunWith(Enclosed.class)
 public class JavaInteropTest {
     public static class GeneralInterop extends PythonTests {
@@ -301,13 +301,14 @@ public void accessSuitePy() throws IOException {
                             "suite.py").build();
             Value suite = context.eval(suitePy);
 
+            Value listConverter = context.eval("python", "list");
             Value libraries = suite.getMember("libraries");
             assertNotNull("libraries found", libraries);
-            final List<Object> suiteKeys = Arrays.asList(suite.invokeMember("keys").as(Object[].class));
+            final List<Object> suiteKeys = Arrays.asList(listConverter.execute(suite.invokeMember("keys")).as(Object[].class));
             assertTrue("Libraries found among keys: " + suiteKeys, suiteKeys.contains("libraries"));
 
             Value dacapo = null;
-            for (Object k : libraries.invokeMember("keys").as(List.class)) {
+            for (Object k : listConverter.execute(libraries.invokeMember("keys")).as(List.class)) {
                 System.err.println("k " + k);
                 if ("DACAPO".equals(k)) {
                     dacapo = libraries.getMember((String) k);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -275,17 +275,13 @@ public Object readMember(String key,
     @ExportMessage
     public boolean hasArrayElements(
                     @CachedLibrary("this") PythonObjectLibrary dataModelLibrary) {
-        return (dataModelLibrary.isSequence(this) || dataModelLibrary.isIterable(this)) && !dataModelLibrary.isMapping(this);
+        return dataModelLibrary.isSequence(this) && !dataModelLibrary.isMapping(this);
     }
 
     @ExportMessage
     public Object readArrayElement(long key,
                     @CachedLibrary("this") PythonObjectLibrary dataModelLibrary,
                     @Shared("getItemNode") @Cached PInteropSubscriptNode getItemNode,
-                    @Exclusive @Cached LookupInheritedAttributeNode.Dynamic lookupIterNode,
-                    @Exclusive @Cached LookupInheritedAttributeNode.Dynamic lookupNextNode,
-                    @Exclusive @Cached CallNode callIterNode,
-                    @Exclusive @Cached CallNode callNextNode,
                     @Shared("toForeign") @Cached PTypeToForeignNode toForeign) throws UnsupportedMessageException, InvalidArrayIndexException {
         if (dataModelLibrary.isSequence(this)) {
             try {
@@ -301,21 +297,6 @@ public Object readArrayElement(long key,
             }
         }
 
-        if (dataModelLibrary.isIterable(this)) {
-            Object attrIter = lookupIterNode.execute(this, SpecialMethodNames.__ITER__);
-            Object iter = callIterNode.execute(null, attrIter, this);
-            if (iter != this) {
-                // there is a separate iterator for this object, should be safe to consume
-                Object result = iterateToKey(lookupNextNode, callNextNode, iter, key);
-                if (result != PNone.NO_VALUE) {
-                    return result;
-                }
-                // TODO(fa) refine exception handling
-                // it's an iterable, so we assume the index is wrong
-                throw InvalidArrayIndexException.create(key);
-            }
-        }
-
         throw UnsupportedMessageException.create();
     }
 
@@ -353,15 +334,6 @@ public void removeArrayElement(long key,
         }
     }
 
-    private static Object iterateToKey(LookupInheritedAttributeNode.Dynamic lookupNextNode, CallNode callNextNode, Object iter, long key) {
-        Object value = PNone.NO_VALUE;
-        for (long i = 0; i <= key; i++) {
-            Object attrNext = lookupNextNode.execute(iter, SpecialMethodNames.__NEXT__);
-            value = callNextNode.execute(null, attrNext, iter);
-        }
-        return value;
-    }
-
     @ExportMessage
     public long getArraySize(@CachedLibrary("this") PythonObjectLibrary lib) throws UnsupportedMessageException {
         // since a call to this method must be preceded by a call to 'hasArrayElements', we just