if the number is already a PInt, we shouldn't call __index__

Author: timfel

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

@@ -710,22 +710,28 @@ public final boolean canBeIndex(@Exclusive @Cached HasInheritedAttributeNode.Dyn
 
     @ExportMessage
     public int asIndexWithState(ThreadState state,
+                    @Exclusive @Cached("createBinaryProfile()") ConditionProfile wasPInt,
                     @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState,
                     @Exclusive @Cached("createBinaryProfile()") ConditionProfile noIndex,
                     @Exclusive @Cached LookupInheritedAttributeNode.Dynamic lookupIndex,
                     @Exclusive @Cached BranchProfile overflow,
                     @Exclusive @Cached PRaiseNode raise,
                     @Exclusive @Cached CallNode callNode,
                     @Exclusive @Cached CastToJavaLongNode castToLong) {
-        Object indexAttr = lookupIndex.execute(this, __INDEX__);
-        if (noIndex.profile(indexAttr == PNone.NO_VALUE)) {
-            throw raise.raise(PythonBuiltinClassType.TypeError, "'%p' object cannot be interpreted as an integer", this);
-        }
         Object result;
-        if (gotState.profile(state == null)) {
-            result = callNode.execute(indexAttr, this);
+        if (wasPInt.profile(this instanceof PInt)) {
+            // c.f. PyNumber_Index
+            result = this;
         } else {
-            result = callNode.execute(PArguments.frameForCall(state), indexAttr, this);
+            Object indexAttr = lookupIndex.execute(this, __INDEX__);
+            if (noIndex.profile(indexAttr == PNone.NO_VALUE)) {
+                throw raise.raise(PythonBuiltinClassType.TypeError, "'%p' object cannot be interpreted as an integer", this);
+            }
+            if (gotState.profile(state == null)) {
+                result = callNode.execute(indexAttr, this);
+            } else {
+                result = callNode.execute(PArguments.frameForCall(state), indexAttr, this);
+            }
         }
         try {
             return PInt.intValueExact(castToLong.execute(result));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java

@@ -233,7 +233,7 @@ public boolean canBeIndex(Object receiver) {
      * Coerces the receiver into an index-sized integer, using the same
      * mechanism as {@code PyNumber_AsSsize_t}:
      * <ol>
-     * <li> Call <code>__index__</code> (resp. <code>PyNumber_Index</code>) </li>
+     * <li> Call <code>__index__</code> if the object is not already a Python int (resp. <code>PyNumber_Index</code>) </li>
      * <li> Do a hard cast to long as per <code>PyLong_AsSsize_t</code> </li>
      * </ol>
      * @return <code>-1</code> if the cast fails or overflows the <code>int</code> range