Don't try to cast native primitive subclasses

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyFloatAsDoubleNode.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.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
@@ -59,7 +58,6 @@
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.util.CastToJavaDoubleNode;
-import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -103,11 +101,11 @@ public abstract class PyFloatAsDoubleNode extends PNodeWithContext {
         return object ? 1.0 : 0.0;
     }
 
-    @Specialization(guards = {"!isDouble(object)", "!isInteger(object)", "!isBoolean(object)", "!isPFloat(object)", "!isNativeObject(object) || !isSubtypeNode.execute(type, PFloat)"}, limit = "1")
+    // TODO When we implement casting native floats, this should cast them directly instead of
+    // calling their __float__
+    @Specialization(guards = {"!isDouble(object)", "!isInteger(object)", "!isBoolean(object)", "!isPFloat(object)"})
     double doObject(VirtualFrame frame, Object object,
-                    @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
-                    @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
-                    @Bind("getClassNode.execute(object)") Object type,
+                    @Cached GetClassNode getClassNode,
                     @Cached LookupSpecialMethodNode.Dynamic lookup,
                     @Cached CallUnaryMethodNode call,
                     @Cached GetClassNode resultClassNode,
@@ -118,6 +116,7 @@ public abstract class PyFloatAsDoubleNode extends PNodeWithContext {
                     @Cached CastToJavaDoubleNode cast,
                     @Cached WarningsModuleBuiltins.WarnNode warnNode,
                     @Cached PRaiseNode raiseNode) {
+        Object type = getClassNode.execute(object);
         Object floatDescr = lookup.execute(frame, type, __FLOAT__, object, false);
         if (floatDescr != PNone.NO_VALUE) {
             Object result = call.executeObject(frame, floatDescr, object);
@@ -139,14 +138,6 @@ public abstract class PyFloatAsDoubleNode extends PNodeWithContext {
         throw raiseNode.raise(TypeError, ErrorMessages.MUST_BE_REAL_NUMBER, object);
     }
 
-    @Specialization(guards = "isSubtypeNode.execute(getClassNode.execute(object), PFloat)", limit = "1")
-    double doNativeObject(@SuppressWarnings("unused") PythonAbstractNativeObject object,
-                    @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
-                    @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
-                    @Cached CastToJavaDoubleNode cast) {
-        return cast.execute(object);
-    }
-
     public static PyFloatAsDoubleNode create() {
         return PyFloatAsDoubleNodeGen.create();
     }

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

@@ -48,7 +48,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.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
@@ -60,8 +59,6 @@
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.util.OverflowException;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -100,11 +97,11 @@ static long doBoolean(boolean x) {
         return x ? 1 : 0;
     }
 
-    @Specialization(guards = {"!canBeInteger(object)", "!isNativeObject(object) || !isSubtypeNode.execute(type, PInt)"}, limit = "1")
+    // TODO When we implement casting native longs, this should cast them instead of calling their
+    // __index__
+    @Specialization(guards = "!canBeInteger(object)")
     long doObject(VirtualFrame frame, Object object,
-                    @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
-                    @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
-                    @Bind("getClassNode.execute(object)") Object type,
+                    @Cached GetClassNode getClassNode,
                     @Cached GetClassNode resultClassNode,
                     @Cached LookupSpecialMethodNode.Dynamic lookupIndex,
                     @Cached LookupSpecialMethodNode.Dynamic lookupInt,
@@ -114,6 +111,7 @@ long doObject(VirtualFrame frame, Object object,
                     @Cached WarningsModuleBuiltins.WarnNode warnNode,
                     @Cached PRaiseNode raiseNode,
                     @Cached PyLongAsLongAndOverflowNode recursive) throws OverflowException {
+        Object type = getClassNode.execute(object);
         Object indexDescr = lookupIndex.execute(frame, type, __INDEX__, object, false);
         Object result = null;
         if (indexDescr != PNone.NO_VALUE) {
@@ -133,14 +131,6 @@ long doObject(VirtualFrame frame, Object object,
         return recursive.execute(frame, result);
     }
 
-    @Specialization(guards = "isSubtypeNode.execute(getClassNode.execute(object), PInt)", limit = "1")
-    @TruffleBoundary
-    long doNativeObject(@SuppressWarnings("unused") PythonAbstractNativeObject object,
-                    @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
-                    @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode) {
-        throw new RuntimeException("casting a native long object to a Java long is not implemented yet");
-    }
-
     private static void checkResult(VirtualFrame frame, Object originalObject, Object result, GetClassNode getClassNode, IsSubtypeNode isSubtype, IsBuiltinClassProfile isInt, PRaiseNode raiseNode,
                     WarningsModuleBuiltins.WarnNode warnNode, String methodName) {
         if (!isInt.profileObject(result, PythonBuiltinClassType.PInt)) {

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

@@ -56,9 +56,9 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 /**
- * Equivalent of CPython's {@code PyLong_AsLongAndOverflow}. Converts an object into a Java long
- * using it's {@code __index__} or (deprecated) {@code __int__} method. Raises {@code OverflowError}
- * on overflow.
+ * Equivalent of CPython's {@code PyLong_AsLong}. Converts an object into a Java long using it's
+ * {@code __index__} or (deprecated) {@code __int__} method. Raises {@code OverflowError} on
+ * overflow.
  */
 @GenerateUncached
 @ImportStatic({PGuards.class, PythonBuiltinClassType.class})