set the type of builtins written in python to builtin_function_or_method

Author: timfel

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

@@ -1357,7 +1357,7 @@ public boolean visit(Node node) {
                 builtinModule = getContext().getCore().lookupBuiltinModule(moduleName);
                 assert builtinModule != null;
             }
-            return factory().createMethod(builtinModule, builtinFunc);
+            return factory().createBuiltinMethod(builtinModule, builtinFunc);
         }
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/BuiltinMethodBuiltins.java

@@ -38,8 +38,8 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
-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.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -57,20 +57,32 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
-        @Child GetClassNode getClassNode;
+        boolean isBuiltinFunction(PBuiltinMethod self) {
+            return self.getSelf() instanceof PythonModule;
+        }
+
+        boolean isBuiltinFunction(PMethod self) {
+            return self.getSelf() instanceof PythonModule && self.getFunction().getEnclosingClassName() == null;
+        }
+
+        @Specialization(guards = "isBuiltinFunction(self)")
+        @TruffleBoundary
+        Object reprBuiltinFunction(PMethod self) {
+            // (tfel): this only happens for builtin modules ... I think
+            return String.format("<built-in function %s>", self.getName());
+        }
+
+        @Specialization(guards = "isBuiltinFunction(self)")
+        @TruffleBoundary
+        String reprBuiltinFunction(PBuiltinMethod self) {
+            return String.format("<built-in function %s>", self.getName());
+        }
 
-        @Specialization
+        @Specialization(guards = "!isBuiltinFunction(self)")
         @TruffleBoundary
-        Object reprModuleFunction(PBuiltinMethod self) {
-            if (self.getSelf() instanceof PythonModule) {
-                return String.format("<built-in function %s>", self.getName());
-            } else {
-                if (getClassNode == null) {
-                    CompilerDirectives.transferToInterpreterAndInvalidate();
-                    getClassNode = insert(GetClassNode.create());
-                }
-                return String.format("<built-in method %s of %s object at 0x%x>", self.getName(), getClassNode.execute(self.getSelf()).getName(), self.hashCode());
-            }
+        Object reprBuiltinMethod(PBuiltinMethod self,
+                        @Cached("create()") GetClassNode getClassNode) {
+            return String.format("<built-in method %s of %s object at 0x%x>", self.getName(), getClassNode.execute(self.getSelf()).getName(), self.hashCode());
         }
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/MethodBuiltins.java

@@ -35,21 +35,18 @@
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
-import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
-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.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
-import com.oracle.truffle.api.profiles.BranchProfile;
 
 @CoreFunctions(extendClasses = {PMethod.class})
 public class MethodBuiltins extends PythonBuiltins {
@@ -87,23 +84,10 @@ protected Object doIt(PMethod self,
     @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
-        @Child GetClassNode getClassNode;
-        BranchProfile builtinProfile = BranchProfile.create();
-
         @Specialization
         @TruffleBoundary
-        Object reprModuleFunction(PMethod self) {
-            if (self.getSelf() instanceof PythonModule) {
-                if (self.getFunction().getEnclosingClassName() == null) {
-                    builtinProfile.enter();
-                    // (tfel): this only happens for builtin modules ... I think
-                    return String.format("<built-in function %s>", self.getName());
-                }
-            }
-            if (getClassNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                getClassNode = insert(GetClassNode.create());
-            }
+        Object reprMethod(PMethod self,
+                        @Cached("create()") GetClassNode getClassNode) {
             return String.format("<built-in method %s of %s object at 0x%x>", self.getName(), getClassNode.execute(self.getSelf()).getName(), self.hashCode());
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -347,6 +347,10 @@ public final PMethod createMethod(Object self, PFunction function) {
         return createMethod(lookupClass(PythonBuiltinClassType.PMethod), self, function);
     }
 
+    public final PMethod createBuiltinMethod(Object self, PFunction function) {
+        return createMethod(lookupClass(PythonBuiltinClassType.PBuiltinMethod), self, function);
+    }
+
     public final PBuiltinMethod createBuiltinMethod(PythonClass cls, Object self, PBuiltinFunction function) {
         return trace(new PBuiltinMethod(cls, self, function));
     }