Improve inlining of method constructor.

Author: fangerer

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

@@ -1801,7 +1801,7 @@ public Object generator(Object args, Object kwargs) {
 
     @Builtin(name = "method", fixedNumOfPositionalArgs = 3, constructsClass = {PythonBuiltinClassType.PMethod}, isPublic = false)
     @GenerateNodeFactory
-    public abstract static class MethodTypeNode extends PythonBuiltinNode {
+    public abstract static class MethodTypeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object method(PythonClass cls, Object self, PFunction func) {
             return factory().createMethod(cls, self, func);

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

@@ -1394,6 +1394,14 @@ synchronized public Object doIt(PFunction func) {
                  * declare the module argument
                  */
                 builtinFunc = func;
+                func.getFunctionRootNode().accept(new NodeVisitor() {
+                    public boolean visit(Node node) {
+                        if (node instanceof PythonCallNode) {
+                            node.replace(((PythonCallNode) node).asSpecialCall());
+                        }
+                        return true;
+                    }
+                });
             } else {
                 /*
                  * Otherwise, we create a new function with an arity that requires one extra

graalpython/lib-graalpython/classmethod.py

@@ -43,6 +43,7 @@ class classmethod(object):
     def __init__(self, func):
         self.__func__ = func
 
+    @__builtin__
     def __get__(self, instance, owner=None):
         if owner is None:
             return classmethod.method(type(instance), self.__func__)