Refactoring of real and imag nodes.

Author: ppisl

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

@@ -75,6 +75,7 @@
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.JavaTypeConversions;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -879,23 +880,29 @@ abstract static class NegNode extends PythonUnaryBuiltinNode {
     @GenerateNodeFactory
     @Builtin(name = "real", fixedNumOfArguments = 1, isGetter = true, doc = "the real part of a complex number")
     static abstract class RealNode extends PythonBuiltinNode {
-        @Specialization
-        float get(float self) {
-            return self;
+        
+        @Child private GetClassNode getClassNode;
+        
+        protected PythonClass getClass(Object value) {
+            if (getClassNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                getClassNode = insert(GetClassNode.create());
+            }
+            return getClassNode.execute(value);
         }
-
+        
         @Specialization
         double get(double self) {
             return self;
         }
 
-        @Specialization
-        PFloat get(PFloat self,
-                        @Cached("create()") GetClassNode clazzNode) {
-            PythonClass clazz = clazzNode.execute(self);
-            if (clazz.isBuiltin()) {
-                return self;
-            }
+        @Specialization (guards ="cannotBeOverridden(getClass(self))")
+        PFloat getPFloat(PFloat self) {
+            return self;
+        }
+        
+        @Specialization (guards ="!cannotBeOverridden(getClass(self))")
+        PFloat getPFloatOverriden(PFloat self) {
             return factory().createFloat(self.getValue());
         }
     }
@@ -905,19 +912,10 @@ PFloat get(PFloat self,
     static abstract class ImagNode extends PythonBuiltinNode {
 
         @Specialization
-        float get(@SuppressWarnings("unused") float self) {
-            return 0;
-        }
-
-        @Specialization
-        double get(@SuppressWarnings("unused") double self) {
-            return 0;
-        }
-
-        @Specialization
-        double get(@SuppressWarnings("unused") PFloat self) {
+        double get(@SuppressWarnings("unused") Object self) {
             return 0;
         }
+        
     }
 
     @Builtin(name = __GETFORMAT__, fixedNumOfArguments = 2)

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

@@ -56,8 +56,8 @@
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.ArithmeticUtil;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -1855,6 +1855,17 @@ int bitLength(PInt argument) {
     @GenerateNodeFactory
     @Builtin(name = "real", fixedNumOfArguments = 1, isGetter = true, doc = "the real part of a complex number")
     static abstract class RealNode extends PythonBuiltinNode {
+        
+        @Child private GetClassNode getClassNode;
+        
+        protected PythonClass getClass(Object value) {
+            if (getClassNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                getClassNode = insert(GetClassNode.create());
+            }
+            return getClassNode.execute(value);
+        }
+        
         @Specialization
         int get(boolean self) {
             return self ? 1 : 0;
@@ -1870,13 +1881,13 @@ long get(long self) {
             return self;
         }
 
-        @Specialization
-        PInt get(PInt self,
-                        @Cached("create()") GetClassNode clazzNode) {
-            PythonClass clazz = clazzNode.execute(self);
-            if (clazz.isBuiltin()) {
-                return self;
-            }
+        @Specialization(guards ="cannotBeOverridden(getClass(self))")
+        PInt getPInt(PInt self) {
+            return self;
+        }
+        
+        @Specialization(guards ="!cannotBeOverridden(getClass(self))")
+        PInt getPIntOverriden(PInt self) {
             return factory().createInt(self.getValue());
         }
     }
@@ -1885,22 +1896,7 @@ PInt get(PInt self,
     @Builtin(name = "imag", fixedNumOfArguments = 1, isGetter = true, doc = "the imaginary part of a complex number")
     static abstract class ImagNode extends PythonBuiltinNode {
         @Specialization
-        int get(@SuppressWarnings("unused") boolean self) {
-            return 0;
-        }
-
-        @Specialization
-        int get(@SuppressWarnings("unused") int self) {
-            return 0;
-        }
-
-        @Specialization
-        int get(@SuppressWarnings("unused") long self) {
-            return 0;
-        }
-
-        @Specialization
-        int get(@SuppressWarnings("unused") PInt self) {
+        int get(@SuppressWarnings("unused") Object self) {
             return 0;
         }
     }
@@ -1915,27 +1911,11 @@ static abstract class NumeratorNode extends RealNode {
     @Builtin(name = "denominator", fixedNumOfArguments = 1, isGetter = true, doc = "the denominator of a rational number in lowest terms")
     static abstract class DenominatorNode extends PythonBuiltinNode {
         @Specialization
-        int get(@SuppressWarnings("unused") boolean self) {
-            return 1;
-        }
-
-        @Specialization
-        int get(@SuppressWarnings("unused") int self) {
-            return 1;
-        }
-
-        @Specialization
-        int get(@SuppressWarnings("unused") long self) {
-            return 1;
-        }
-
-        @Specialization
-        int get(@SuppressWarnings("unused") PInt self) {
+        int get(@SuppressWarnings("unused") Object self) {
             return 1;
         }
     }
 
-    
     @Builtin(name = SpecialMethodNames.__INT__, fixedNumOfArguments = 1)
     @GenerateNodeFactory
     abstract static class IntNode extends PythonBuiltinNode {