make sure native objects that also implement __index__ but are not int subclasses also convert to asIndex

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonAbstractNativeObject.java

@@ -58,7 +58,10 @@
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.nodes.PRaiseNode;
+import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
+import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
+import com.oracle.graal.python.nodes.object.GetLazyClassNode;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -77,6 +80,7 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.object.Shape;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.llvm.spi.ReferenceLibrary;
 
@@ -160,18 +164,22 @@ public void setDict(PHashingCollection value) throws UnsupportedMessageException
     }
 
     @ExportMessage
-    public boolean canBeIndex(@Exclusive @Cached IsSubtypeNode isSubtypeNode) {
-        return isSubtypeNode.execute(this, PythonBuiltinClassType.PInt);
-    }
-
-    @ExportMessage
-    public Object asIndexWithState(@SuppressWarnings("unused") ThreadState threadState,
+    public Object asIndexWithState(ThreadState threadState,
+                    @Exclusive @Cached GetLazyClassNode getClass,
                     @Exclusive @Cached IsSubtypeNode isSubtypeNode,
-                    @Exclusive @Cached PRaiseNode raise) {
-        if (canBeIndex(isSubtypeNode)) {
-            return this;
+                    // arguments for super-implementation call
+                    @CachedLibrary(limit = "1") PythonObjectLibrary lib,
+                    @Exclusive @Cached PRaiseNode raise,
+                    @Exclusive @Cached CallNode callNode,
+                    @Exclusive @Cached IsSubtypeNode isSubtype,
+                    @Exclusive @Cached LookupInheritedAttributeNode.Dynamic lookupIndex,
+                    @Exclusive @Cached("createBinaryProfile()") ConditionProfile noIndex,
+                    @Exclusive @Cached("createBinaryProfile()") ConditionProfile resultProfile,
+                    @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState) {
+        if (isSubtypeNode.execute(getClass.execute(this), PythonBuiltinClassType.PInt)) {
+            return this; // subclasses of 'int' should do early return
         } else {
-            throw raise.raiseIntegerInterpretationError(this);
+            return asIndexWithState(threadState, lib, raise, callNode, isSubtype, lookupIndex, noIndex, resultProfile, gotState);
         }
     }