Remove workaround for delegated int conversion

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java

@@ -115,7 +115,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.profiles.BranchProfile;
@@ -2810,25 +2809,6 @@ static PythonNativeVoidPtr doL(PythonNativeVoidPtr self) {
     @Builtin(name = SpecialMethodNames.__INDEX__, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     abstract static class IndexNode extends IntNode {
-        // TODO: Remove again once GR-30482 is fixed
-        @Specialization(guards = "!isAnyPythonObject(object)", limit = "3")
-        static long doForeign(Object object,
-                        @CachedLibrary("object") InteropLibrary lib) {
-            if (lib.isBoolean(object)) {
-                try {
-                    return PInt.intValue(lib.asBoolean(object));
-                } catch (UnsupportedMessageException e) {
-                    // fall through
-                }
-            } else if (lib.fitsInLong(object)) {
-                try {
-                    return lib.asLong(object);
-                } catch (UnsupportedMessageException e) {
-                    // fall through
-                }
-            }
-            throw CompilerDirectives.shouldNotReachHere("Must fix GR-30482");
-        }
     }
 
     @Builtin(name = SpecialMethodNames.__GETNEWARGS__, minNumOfPositionalArgs = 1)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberIndexNode.java

@@ -47,7 +47,6 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.modules.WarningsModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -100,7 +99,7 @@ static PInt doPInt(PInt object) {
     }
 
     @Specialization(rewriteOn = UnexpectedResultException.class)
-    int doCallIndexInt(VirtualFrame frame, PythonAbstractObject object,
+    int doCallIndexInt(VirtualFrame frame, Object object,
                     @Shared("callIndex") @Cached CallIndexNode callIndex,
                     @Shared("getClass") @Cached GetClassNode getClassNode,
                     @Shared("isSubtype") @Cached IsSubtypeNode isSubtype) throws UnexpectedResultException {
@@ -123,17 +122,16 @@ int doCallIndexInt(VirtualFrame frame, PythonAbstractObject object,
         }
     }
 
-    // TODO: Accept "Object" again once GR-30482 is fixed
     @Specialization(replaces = "doCallIndexInt")
-    static Object doCallIndex(VirtualFrame frame, PythonAbstractObject object,
+    static Object doCallIndex(VirtualFrame frame, Object object,
                     @Shared("callIndex") @Cached CallIndexNode callIndex,
                     @Shared("getClass") @Cached GetClassNode getClassNode,
                     @Shared("isSubtype") @Cached IsSubtypeNode isSubtype,
-                    @Shared("resultClass") @Cached GetClassNode resultClassNode,
-                    @Shared("resultSubtype") @Cached IsSubtypeNode resultSubtype,
-                    @Shared("isInt") @Cached IsBuiltinClassProfile isInt,
-                    @Shared("raiseNode") @Cached PRaiseNode raiseNode,
-                    @Shared("warnNode") @Cached WarningsModuleBuiltins.WarnNode warnNode) {
+                    @Cached GetClassNode resultClassNode,
+                    @Cached IsSubtypeNode resultSubtype,
+                    @Cached IsBuiltinClassProfile isInt,
+                    @Cached PRaiseNode raiseNode,
+                    @Cached WarningsModuleBuiltins.WarnNode warnNode) {
         if (isSubtype.execute(getClassNode.execute(object), PythonBuiltinClassType.PInt)) {
             return object;
         }
@@ -142,20 +140,6 @@ static Object doCallIndex(VirtualFrame frame, PythonAbstractObject object,
         return result;
     }
 
-    // TODO: Remove again once GR-30482 is fixed
-    @Specialization(guards = "!isAnyPythonObject(object)")
-    static Object doCallIndexForeign(VirtualFrame frame, Object object,
-                    @Shared("callIndex") @Cached CallIndexNode callIndex,
-                    @Shared("resultClass") @Cached GetClassNode resultClassNode,
-                    @Shared("resultSubtype") @Cached IsSubtypeNode resultSubtype,
-                    @Shared("isInt") @Cached IsBuiltinClassProfile isInt,
-                    @Shared("raiseNode") @Cached PRaiseNode raiseNode,
-                    @Shared("warnNode") @Cached WarningsModuleBuiltins.WarnNode warnNode) {
-        Object result = callIndex.execute(frame, object);
-        checkResult(frame, object, result, resultClassNode, resultSubtype, isInt, raiseNode, warnNode);
-        return result;
-    }
-
     private static void checkResult(VirtualFrame frame, Object originalObject, Object result, GetClassNode getClassNode, IsSubtypeNode isSubtype, IsBuiltinClassProfile isInt, PRaiseNode raiseNode,
                     WarningsModuleBuiltins.WarnNode warnNode) {
         if (!isInt.profileObject(result, PythonBuiltinClassType.PInt)) {