Move descriptor call target registration

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltins.java

@@ -35,10 +35,8 @@
 import java.util.Map.Entry;
 
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
-import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.function.BuiltinFunctionRootNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.util.BiConsumer;
@@ -77,24 +75,12 @@ public void initialize(Python3Core core) {
             }
             RootCallTarget callTarget = core.getLanguage().createCachedCallTarget(l -> new BuiltinFunctionRootNode(l, builtin, factory, declaresExplicitSelf), factory.getNodeClass(),
                             builtin.name());
-            if (SpecialMethodSlot.findSpecialSlot(builtin.name()) != null) {
-                for (PythonBuiltinClassType type : annotation.extendClasses()) {
-                    BuiltinMethodDescriptor descriptor = BuiltinMethodDescriptor.get(factory, type);
-                    if (descriptor != null) {
-                        core.getLanguage().registerBuiltinDescriptorCallTarget(descriptor, callTarget);
-                    }
-                }
-            }
             Object builtinDoc = builtin.doc().isEmpty() ? PNone.NONE : builtin.doc();
             if (constructsClass != PythonBuiltinClassType.nil) {
                 assert !builtin.isGetter() && !builtin.isSetter() && !builtin.isClassmethod() && !builtin.isStaticmethod();
                 // we explicitly do not make these "staticmethods" here, since CPython also doesn't
                 // for builtin types
                 PBuiltinFunction newFunc = core.factory().createBuiltinFunction(__NEW__, constructsClass, numDefaults(builtin), callTarget);
-                BuiltinMethodDescriptor descriptor = BuiltinMethodDescriptor.get(newFunc);
-                if (descriptor != null) {
-                    core.getLanguage().registerBuiltinDescriptorCallTarget(descriptor, callTarget);
-                }
                 PythonBuiltinClass builtinClass = core.lookupType(constructsClass);
                 builtinClass.setAttributeUnsafe(__NEW__, newFunc);
                 builtinClass.setAttribute(__DOC__, builtinDoc);

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

@@ -80,6 +80,7 @@
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
+import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
@@ -144,6 +145,7 @@
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.StructSequence.BuiltinTypeDescriptor;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
+import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
@@ -524,11 +526,25 @@ public final PFunction createFunction(String name, String qualname, String enclo
     }
 
     public final PBuiltinFunction createBuiltinFunction(String name, Object type, int numDefaults, RootCallTarget callTarget) {
-        return trace(new PBuiltinFunction(getLanguage(), name, type, numDefaults, callTarget));
+        PBuiltinFunction function = trace(new PBuiltinFunction(getLanguage(), name, type, numDefaults, callTarget));
+        registerBuiltinCallTarget(function, name, type, callTarget);
+        return function;
     }
 
     public final PBuiltinFunction createBuiltinFunction(String name, Object type, Object[] defaults, PKeyword[] kw, RootCallTarget callTarget) {
-        return trace(new PBuiltinFunction(getLanguage(), name, type, defaults, kw, callTarget));
+        PBuiltinFunction function = trace(new PBuiltinFunction(getLanguage(), name, type, defaults, kw, callTarget));
+        registerBuiltinCallTarget(function, name, type, callTarget);
+        return function;
+    }
+
+    @TruffleBoundary
+    private void registerBuiltinCallTarget(PBuiltinFunction function, String name, Object type, RootCallTarget callTarget) {
+        if ((type instanceof PythonBuiltinClassType || type instanceof PythonBuiltinClass) && SpecialMethodSlot.findSpecialSlot(name) != null) {
+            BuiltinMethodDescriptor descriptor = BuiltinMethodDescriptor.get(function);
+            if (descriptor != null) {
+                getLanguage().registerBuiltinDescriptorCallTarget(descriptor, callTarget);
+            }
+        }
     }
 
     public final GetSetDescriptor createGetSetDescriptor(Object get, Object set, String name, Object type) {