Address review feedback

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedIONodes.java

@@ -68,10 +68,12 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaLongExactNode;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -222,11 +224,14 @@ static long toLong(VirtualFrame frame, Object number, PythonBuiltinClassType err
                         @Cached PyNumberIndexNode indexNode,
                         @Cached CastToJavaLongExactNode cast,
                         @Cached IsBuiltinClassProfile errorProfile) {
+            Object index = indexNode.execute(frame, number);
             try {
-                return cast.execute(indexNode.execute(frame, number));
+                return cast.execute(index);
             } catch (PException e) {
                 e.expect(OverflowError, errorProfile);
                 throw raiseNode.raise(err, CANNOT_FIT_P_IN_OFFSET_SIZE, number);
+            } catch (CannotCastException e) {
+                throw CompilerDirectives.shouldNotReachHere();
             }
         }
     }

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

@@ -77,22 +77,22 @@ public abstract class PyFloatAsDoubleNode extends PNodeWithContext {
     public abstract double execute(Frame frame, Object object);
 
     @Specialization
-    double doDouble(double object) {
+    static double doDouble(double object) {
         return object;
     }
 
     @Specialization
-    double doPFloat(PFloat object) {
+    static double doPFloat(PFloat object) {
         return object.getValue();
     }
 
     @Specialization
-    double doInt(int object) {
+    static double doInt(int object) {
         return object;
     }
 
     @Specialization
-    double doLong(long object) {
+    static double doLong(long object) {
         return object;
     }
 
@@ -104,7 +104,7 @@ public abstract class PyFloatAsDoubleNode extends PNodeWithContext {
     // 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,
+    static double doObject(VirtualFrame frame, Object object,
                     @Cached GetClassNode getClassNode,
                     @Cached LookupSpecialMethodNode.Dynamic lookup,
                     @Cached CallUnaryMethodNode call,

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

@@ -74,14 +74,14 @@ public abstract class PyFloatFromString extends PNodeWithContext {
     public abstract double execute(Frame frame, String obj);
 
     @Specialization
-    double doString(VirtualFrame frame, String object,
+    static double doString(VirtualFrame frame, String object,
                     @Shared("repr") @Cached ObjectNodes.ReprAsJavaStringNode reprNode,
                     @Shared("raise") @Cached PRaiseNode raiseNode) {
         return convertStringToDouble(frame, object, object, reprNode, raiseNode);
     }
 
     @Specialization
-    double doGeneric(VirtualFrame frame, Object object,
+    static double doGeneric(VirtualFrame frame, Object object,
                     @Cached CastToJavaStringNode cast,
                     @CachedLibrary(limit = "3") PythonObjectLibrary lib,
                     @Shared("repr") @Cached ObjectNodes.ReprAsJavaStringNode reprNode,

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

@@ -77,27 +77,27 @@ public abstract class PyNumberFloatNode extends PNodeWithContext {
     public abstract double execute(Frame frame, Object object);
 
     @Specialization
-    double doDouble(double object) {
+    static double doDouble(double object) {
         return object;
     }
 
     @Specialization
-    double doInt(int object) {
+    static double doInt(int object) {
         return object;
     }
 
     @Specialization
-    double doLong(long object) {
+    static double doLong(long object) {
         return object;
     }
 
     @Specialization
-    double doBoolean(boolean object) {
+    static double doBoolean(boolean object) {
         return object ? 1.0 : 0.0;
     }
 
     @Specialization(guards = {"!isDouble(object)", "!isInteger(object)", "!isBoolean(object)"})
-    double doObject(VirtualFrame frame, Object object,
+    static double doObject(VirtualFrame frame, Object object,
                     @Cached GetClassNode getClassNode,
                     @Cached LookupSpecialMethodNode.Dynamic lookup,
                     @Cached CallUnaryMethodNode call,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodNode.java

@@ -53,6 +53,7 @@
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 
 /**
@@ -90,7 +91,7 @@ public static Dynamic getUncached() {
         }
 
         @Specialization
-        Object lookup(Object type, String name, Object receiver, boolean ignoreDescriptorException,
+        Object lookup(VirtualFrame frame, Object type, String name, Object receiver, boolean ignoreDescriptorException,
                         @Cached LookupAttributeInMRONode.Dynamic lookupAttr,
                         @Cached LookupInheritedAttributeNode.Dynamic lookupGet,
                         @Cached CallNode callGet) {
@@ -102,7 +103,7 @@ Object lookup(Object type, String name, Object receiver, boolean ignoreDescripto
             Object getMethod = lookupGet.execute(descriptor, SpecialMethodNames.__GET__);
             if (getMethod != PNone.NO_VALUE) {
                 try {
-                    return new BoundDescriptor(callGet.execute(getMethod, descriptor, receiver, type));
+                    return new BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, type));
                 } catch (PException pe) {
                     if (ignoreDescriptorException) {
                         return PNone.NO_VALUE;