Add typed methods for accessing call target cache

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -54,6 +54,7 @@
 import com.oracle.graal.python.nodes.call.InvokeNode;
 import com.oracle.graal.python.nodes.control.TopLevelExceptionHandler;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
+import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.util.BadOPCodeNode;
 import com.oracle.graal.python.parser.PythonParserImpl;
 import com.oracle.graal.python.runtime.GilNode;
@@ -858,8 +859,17 @@ public RootCallTarget createCachedCallTarget(Function<PythonLanguage, RootNode>
         return createCachedCallTarget(rootNodeFunction, Arrays.asList(cacheKeys));
     }
 
+    public RootCallTarget createBuiltinCachedCallTarget(Function<PythonLanguage, RootNode> rootNodeFunction, Class<? extends PythonBuiltinBaseNode> nodeClass, String name) {
+        return createCachedCallTarget(rootNodeFunction, Arrays.asList(nodeClass, name));
+    }
+
+    @TruffleBoundary
+    public RootCallTarget getCachedBuiltinCallTarget(Class<? extends PythonBuiltinBaseNode> nodeClass, String name) {
+        return cachedCallTargets.get(Arrays.asList(nodeClass, name));
+    }
+
     @TruffleBoundary
-    public RootCallTarget getCachedCallTarget(Object... cacheKeys) {
-        return cachedCallTargets.get(Arrays.asList(cacheKeys));
+    public RootCallTarget getCachedBuiltinCallTarget(com.oracle.truffle.api.dsl.NodeFactory<? extends PythonBuiltinBaseNode> factory, String name) {
+        return getCachedBuiltinCallTarget(factory.getNodeClass(), name);
     }
 }

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

@@ -73,7 +73,8 @@ public void initialize(Python3Core core) {
             } else {
                 declaresExplicitSelf = true;
             }
-            RootCallTarget callTarget = core.getLanguage().createCachedCallTarget(l -> new BuiltinFunctionRootNode(l, builtin, factory, declaresExplicitSelf), factory.getNodeClass(), builtin.name());
+            RootCallTarget callTarget = core.getLanguage().createBuiltinCachedCallTarget(l -> new BuiltinFunctionRootNode(l, builtin, factory, declaresExplicitSelf), factory.getNodeClass(),
+                            builtin.name());
             Object builtinDoc = builtin.doc().isEmpty() ? PNone.NONE : builtin.doc();
             if (constructsClass != PythonBuiltinClassType.nil) {
                 assert !builtin.isGetter() && !builtin.isSetter() && !builtin.isClassmethod() && !builtin.isStaticmethod();

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

@@ -97,7 +97,7 @@ Object callSpecialMethodSlotInlined(VirtualFrame frame, @SuppressWarnings("unuse
     Object callSpecialMethodSlotCallTarget(VirtualFrame frame, BinaryBuiltinInfo info, Object arg1, Object arg2,
                     @CachedLanguage PythonLanguage language,
                     @Cached GenericInvokeNode invokeNode) {
-        RootCallTarget callTarget = language.getCachedCallTarget(info.getFactory().getNodeClass(), info.getName());
+        RootCallTarget callTarget = language.getCachedBuiltinCallTarget(info.getFactory(), info.getName());
         Object[] arguments = PArguments.create(2);
         PArguments.setArgument(arguments, 0, arg1);
         PArguments.setArgument(arguments, 1, arg2);

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

@@ -86,7 +86,7 @@ static Object callSpecialMethodSlotInlined(VirtualFrame frame, @SuppressWarnings
     static Object callSpecialMethodSlotCallTarget(VirtualFrame frame, TernaryBuiltinInfo info, Object arg1, Object arg2, Object arg3,
                     @CachedLanguage PythonLanguage language,
                     @Cached GenericInvokeNode invokeNode) {
-        RootCallTarget callTarget = language.getCachedCallTarget(info.getFactory().getNodeClass(), info.getName());
+        RootCallTarget callTarget = language.getCachedBuiltinCallTarget(info.getFactory(), info.getName());
         Object[] arguments = PArguments.create(3);
         PArguments.setArgument(arguments, 0, arg1);
         PArguments.setArgument(arguments, 1, arg2);

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

@@ -114,7 +114,7 @@ Object callSpecialMethodSlotInlined(VirtualFrame frame, @SuppressWarnings("unuse
     Object callSpecialMethodSlotCallTarget(VirtualFrame frame, UnaryBuiltinInfo info, Object receiver,
                     @CachedLanguage PythonLanguage language,
                     @Cached GenericInvokeNode invokeNode) {
-        RootCallTarget callTarget = language.getCachedCallTarget(info.getFactory().getNodeClass(), info.getName());
+        RootCallTarget callTarget = language.getCachedBuiltinCallTarget(info.getFactory(), info.getName());
         Object[] arguments = PArguments.create(1);
         PArguments.setArgument(arguments, 0, receiver);
         return invokeNode.execute(frame, callTarget, arguments);