Remove lookup base nodes

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -84,7 +84,10 @@
 import com.oracle.truffle.api.strings.TruffleString;
 
 @ImportStatic(PythonOptions.class)
-public abstract class LookupAttributeInMRONode extends LookupInMROBaseNode {
+public abstract class LookupAttributeInMRONode extends PNodeWithContext {
+
+    public abstract Object execute(Object klass);
+
     @GenerateUncached
     @GenerateInline(false) // footprint reduction 36 -> 17
     public abstract static class Dynamic extends PNodeWithContext {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupInMROBaseNode.java

@@ -127,7 +127,7 @@ Object callObjectGeneric(VirtualFrame frame, Object left, Object right,
                     @SuppressWarnings("unused") @Cached("left.getClass()") Class<?> cachedLeftClass,
                     @SuppressWarnings("unused") @Cached("right.getClass()") Class<?> cachedRightClass,
                     @Exclusive @Cached GetClassNode getClassNode,
-                    @Exclusive @Cached("createLookup()") LookupSpecialBaseNode getattr) {
+                    @Exclusive @Cached("create(name)") LookupSpecialMethodNode getattr) {
         return doCallObject(frame, inliningTarget, left, right, getClassNode, getattr);
     }
 
@@ -137,21 +137,16 @@ Object callObjectGeneric(VirtualFrame frame, Object left, Object right,
     Object callObjectMegamorphic(VirtualFrame frame, Object left, Object right,
                     @Bind("this") Node inliningTarget,
                     @Exclusive @Cached GetClassNode getClassNode,
-                    @Exclusive @Cached("createLookup()") LookupSpecialBaseNode getattr) {
+                    @Exclusive @Cached("create(name)") LookupSpecialMethodNode getattr) {
         return doCallObject(frame, inliningTarget, left, right, getClassNode, getattr);
     }
 
-    private Object doCallObject(VirtualFrame frame, Node inliningTarget, Object left, Object right, GetClassNode getClassNode, LookupSpecialBaseNode getattr) {
+    private Object doCallObject(VirtualFrame frame, Node inliningTarget, Object left, Object right, GetClassNode getClassNode, LookupSpecialMethodNode getattr) {
         Object leftClass = getClassNode.execute(inliningTarget, left);
         Object leftCallable = getattr.execute(frame, leftClass, left);
         if (PGuards.isNoValue(leftCallable)) {
             throw SpecialMethodNotFound.INSTANCE;
         }
         return ensureDispatch().executeObject(frame, leftCallable, left, right);
     }
-
-    @NeverDefault
-    protected final LookupSpecialBaseNode createLookup() {
-        return LookupSpecialMethodNode.create(name);
-    }
 }

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

@@ -137,7 +137,7 @@ Object callObjectGeneric(VirtualFrame frame, Object receiver,
                     @Bind("this") Node inliningTarget,
                     @SuppressWarnings("unused") @Cached("receiver.getClass()") Class<?> cachedClass,
                     @Shared @Cached GetClassNode getClassNode,
-                    @Shared @Cached("createLookup()") LookupSpecialBaseNode getattr,
+                    @Shared @Cached("create(name)") LookupSpecialMethodNode getattr,
                     @Shared @Cached CallUnaryMethodNode dispatchNode) {
         return doCallObject(frame, inliningTarget, receiver, getClassNode, getattr, dispatchNode);
     }
@@ -148,7 +148,7 @@ Object callObjectGeneric(VirtualFrame frame, Object receiver,
     Object callObjectMegamorphic(VirtualFrame frame, Object receiver,
                     @Bind("this") Node inliningTarget,
                     @Shared @Cached GetClassNode getClassNode,
-                    @Shared @Cached("createLookup()") LookupSpecialBaseNode getattr,
+                    @Shared @Cached("create(name)") LookupSpecialMethodNode getattr,
                     @Shared @Cached CallUnaryMethodNode dispatchNode) {
         return doCallObject(frame, inliningTarget, receiver, getClassNode, getattr, dispatchNode);
     }
@@ -157,7 +157,7 @@ protected Class<?> getObjectClass(Object object) {
         return object.getClass();
     }
 
-    private Object doCallObject(VirtualFrame frame, Node inliningTarget, Object receiver, GetClassNode getClassNode, LookupSpecialBaseNode getattr, CallUnaryMethodNode dispatchNode) {
+    private Object doCallObject(VirtualFrame frame, Node inliningTarget, Object receiver, GetClassNode getClassNode, LookupSpecialMethodNode getattr, CallUnaryMethodNode dispatchNode) {
         Object attr = getattr.execute(frame, getClassNode.execute(inliningTarget, receiver), receiver);
         if (attr == PNone.NO_VALUE) {
             if (handlerFactory != null) {
@@ -173,11 +173,6 @@ private Object doCallObject(VirtualFrame frame, Node inliningTarget, Object rece
         }
     }
 
-    @NeverDefault
-    protected final LookupSpecialBaseNode createLookup() {
-        return LookupSpecialMethodNode.create(name);
-    }
-
     @GenerateUncached
     @SuppressWarnings("truffle-inlining")       // footprint reduction 36 -> 20
     public abstract static class LookupAndCallUnaryDynamicNode extends PNodeWithContext {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.nodes.call.special;
 
+import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -60,13 +61,15 @@
  * differentiate it from the unbound case. {@link CallUnaryMethodNode} and other method calling
  * nodes handle this wrapper.
  */
-public abstract class LookupSpecialMethodNode extends LookupSpecialBaseNode {
+public abstract class LookupSpecialMethodNode extends PNodeWithContext {
     protected final TruffleString name;
 
     public LookupSpecialMethodNode(TruffleString name) {
         this.name = name;
     }
 
+    public abstract Object execute(Frame frame, Object type, Object receiver);
+
     @NeverDefault
     public static LookupSpecialMethodNode create(TruffleString name) {
         return LookupSpecialMethodNodeGen.create(name);