move handling of native float subclasses in float constructor into the __float__ builtin

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -69,10 +69,6 @@
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
 import com.oracle.graal.python.builtins.objects.cell.PCell;
-import com.oracle.graal.python.builtins.objects.cext.CExtNodes.FromNativeSubclassNode;
-import com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols;
-import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
-import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage.DictEntry;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
@@ -155,6 +151,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(defineModule = "builtins")
@@ -490,11 +487,13 @@ public Object floatFromNone(PythonClass cls, @SuppressWarnings("unused") PNone a
         }
 
         @Specialization
-        Object doPythonObject(PythonClass cls, PythonObject obj,
-                        @Cached("create(__FLOAT__)") LookupAndCallUnaryNode callFloatNode) {
+        Object doPythonObject(PythonClass cls, Object obj,
+                        @Cached("create(__FLOAT__)") LookupAndCallUnaryNode callFloatNode,
+                        @Cached("create()") BranchProfile gotException) {
             try {
                 return floatFromFloat(cls, callFloatNode.executeDouble(obj));
             } catch (UnexpectedResultException e) {
+                gotException.enter();
                 Object result = e.getResult();
                 if (result == PNone.NO_VALUE) {
                     throw raise(TypeError, "must be real number, not %p", obj);
@@ -507,21 +506,6 @@ Object doPythonObject(PythonClass cls, PythonObject obj,
             }
         }
 
-        protected static FromNativeSubclassNode cacheGetFloat() {
-            return FromNativeSubclassNode.create(PythonBuiltinClassType.PFloat, NativeCAPISymbols.FUN_PY_FLOAT_AS_DOUBLE);
-        }
-
-        @Specialization
-        Object doNativeFloat(@SuppressWarnings("unused") PythonNativeClass cls, PythonNativeObject possibleBase,
-                        @Cached("cacheGetFloat()") FromNativeSubclassNode getFloat) {
-            Object convertedFloat = getFloat.execute(possibleBase);
-            if (convertedFloat instanceof Double) {
-                return possibleBase; // TODO (tfel): we really need to call back into C
-            } else {
-                throw raise(TypeError, "must be real number, not %p", possibleBase);
-            }
-        }
-
         @Fallback
         @TruffleBoundary
         public Object floatFromObject(@SuppressWarnings("unused") Object cls, Object arg) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java

@@ -177,6 +177,21 @@ abstract static class FloatNode extends PythonUnaryBuiltinNode {
         PFloat doPFloat(PFloat self) {
             return self;
         }
+
+        protected static FromNativeSubclassNode cacheGetFloat() {
+            return FromNativeSubclassNode.create(PythonBuiltinClassType.PFloat, NativeCAPISymbols.FUN_PY_FLOAT_AS_DOUBLE);
+        }
+
+        @Specialization
+        Object doNativeFloat(PythonNativeObject possibleBase,
+                        @Cached("cacheGetFloat()") FromNativeSubclassNode getFloat) {
+            Object convertedFloat = getFloat.execute(possibleBase);
+            if (convertedFloat instanceof Double) {
+                return possibleBase;
+            } else {
+                throw raise(PythonErrorType.TypeError, "must be real number, not %p", possibleBase);
+            }
+        }
     }
 
     @Builtin(name = __ADD__, fixedNumOfArguments = 2)