Use slots (more) in LookupAndCallUnaryNode

steve-s · steve-s · commit 844400751d5f · 2021-12-01T18:01:05.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -85,9 +85,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__COMPLEX__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__HASH__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__INDEX__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INT__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__TRUNC__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.NotImplementedError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
@@ -641,7 +639,7 @@ private PComplex convertStringToComplex(VirtualFrame frame, String src, Object c
             if (str == null) {
                 if (callReprNode == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    callReprNode = insert(LookupAndCallUnaryNode.create(__REPR__));
+                    callReprNode = insert(LookupAndCallUnaryNode.create(SpecialMethodSlot.Repr));
                 }
                 Object strStr = callReprNode.executeObject(frame, origObj);
                 if (PGuards.isString(strStr)) {
@@ -856,7 +854,7 @@ public Object reversed(VirtualFrame frame, Object cls, Object sequence,
                         @Cached GetClassNode getClassNode,
                         @Cached("create(Reversed)") LookupSpecialMethodSlotNode lookupReversed,
                         @Cached CallUnaryMethodNode callReversed,
-                        @Cached("create(__LEN__)") LookupAndCallUnaryNode lookupLen,
+                        @Cached("create(Len)") LookupAndCallUnaryNode lookupLen,
                         @Cached("create(GetItem)") LookupSpecialMethodSlotNode getItemNode,
                         @Cached ConditionProfile noReversedProfile,
                         @Cached ConditionProfile noGetItemProfile) {
@@ -1053,7 +1051,7 @@ private Object stringToInt(VirtualFrame frame, Object cls, String number, int ba
                 invalidValueProfile.enter();
                 if (callReprNode == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    callReprNode = insert(LookupAndCallUnaryNode.create(__REPR__));
+                    callReprNode = insert(LookupAndCallUnaryNode.create(SpecialMethodSlot.Repr));
                 }
                 Object str = callReprNode.executeObject(frame, origObj);
                 if (PGuards.isString(str)) {
@@ -1449,7 +1447,7 @@ protected static FloatBuiltins.IntNode createFloatInt() {
         private Object callIndex(VirtualFrame frame, Object obj) {
             if (callIndexNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callIndexNode = insert(LookupAndCallUnaryNode.create(__INDEX__));
+                callIndexNode = insert(LookupAndCallUnaryNode.create(SpecialMethodSlot.Index));
             }
             Object result = callIndexNode.executeObject(frame, obj);
             // the case when the result is NO_VALUE (i.e. the object does not provide __index__)
@@ -1471,7 +1469,7 @@ private Object callTrunc(VirtualFrame frame, Object obj) {
         private Object callInt(VirtualFrame frame, Object object) {
             if (callIntNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callIntNode = insert(LookupAndCallUnaryNode.create(__INT__));
+                callIntNode = insert(LookupAndCallUnaryNode.create(SpecialMethodSlot.Int));
             }
             Object result = callIntNode.executeObject(frame, object);
             if (result != PNone.NO_VALUE && !isIntegerType(result)) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -2038,7 +2038,7 @@ Object ternary(VirtualFrame frame, Object x, Object y, Object z,
     @GenerateNodeFactory
     public abstract static class SumFunctionNode extends PythonBuiltinNode {
 
-        @Child private LookupAndCallUnaryNode next = LookupAndCallUnaryNode.create(__NEXT__);
+        @Child private LookupAndCallUnaryNode next = LookupAndCallUnaryNode.create(SpecialMethodSlot.Next);
         @Child private AddNode add = AddNode.create();
 
         @Child private IsBuiltinClassProfile errorProfile1 = IsBuiltinClassProfile.create();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java
@@ -25,7 +25,6 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEXT__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.NotImplementedError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
@@ -49,6 +48,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.lib.PyFloatAsDoubleNode;
 import com.oracle.graal.python.lib.PyNumberIndexNode;
 import com.oracle.graal.python.lib.PyObjectGetIter;
@@ -948,7 +948,7 @@ public abstract static class FsumNode extends PythonUnaryBuiltinNode {
         @Specialization
         double doIt(VirtualFrame frame, Object iterable,
                         @Cached PyObjectGetIter getIter,
-                        @Cached("create(__NEXT__)") LookupAndCallUnaryNode callNextNode,
+                        @Cached("create(Next)") LookupAndCallUnaryNode callNextNode,
                         @Cached PyFloatAsDoubleNode asDoubleNode,
                         @Cached IsBuiltinClassProfile stopProfile) {
             Object iterator = getIter.execute(frame, iterable);
@@ -2259,7 +2259,7 @@ private void raiseIfNegative(boolean condition) {
     @GenerateNodeFactory
     public abstract static class ProdNode extends PythonBuiltinNode {
 
-        @Child private LookupAndCallUnaryNode callNextNode = LookupAndCallUnaryNode.create(__NEXT__);
+        @Child private LookupAndCallUnaryNode callNextNode = LookupAndCallUnaryNode.create(SpecialMethodSlot.Next);
         @Child private BinaryOpNode mul = BinaryArithmetic.Mul.create();
         @Child private IsBuiltinClassProfile errorProfile = IsBuiltinClassProfile.create();
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java
@@ -3378,7 +3378,7 @@ abstract static class PyTruffle_OS_DoubleToString extends NativeBuiltin {
         @Specialization(guards = "isReprFormatCode(formatCode)")
         @SuppressWarnings("unused")
         PTuple doRepr(VirtualFrame frame, Object module, double val, int formatCode, int precision, int flags,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode callReprNode,
+                        @Cached("create(Repr)") LookupAndCallUnaryNode callReprNode,
                         @Cached CastToJavaStringNode castToStringNode,
                         @Cached GetNativeNullNode getNativeNullNode) {
             Object reprString = callReprNode.executeObject(frame, val);
@@ -3476,7 +3476,7 @@ static int doMapping(PHashingCollection container,
 
         @Specialization(guards = "!isMappingOrSequence(obj)")
         static Object doGenericUnboxed(VirtualFrame frame, Object obj,
-                        @Cached("create(__LEN__)") LookupAndCallUnaryNode callLenNode,
+                        @Cached("create(Len)") LookupAndCallUnaryNode callLenNode,
                         @Cached ConditionProfile noLenProfile,
                         @Cached CastToNativeLongNode castToLongNode,
                         @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java
@@ -500,7 +500,7 @@ protected abstract static class UnpickleNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object unpickle(VirtualFrame frame, Object typ, PTuple state,
                         @Cached CallNode callNode,
-                        @Cached("create(__NEW__)") LookupAndCallUnaryNode lookupAndCallUnaryNode,
+                        @Cached("create(New)") LookupAndCallUnaryNode lookupAndCallUnaryNode,
                         @Cached("create(__SETSTATE__)") GetAttributeNode setStateAttr) {
             Object obj = lookupAndCallUnaryNode.executeObject(frame, typ);
             Object meth = setStateAttr.executeObject(frame, obj);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java
@@ -1120,7 +1120,7 @@ static Object doit(@SuppressWarnings("unused") PFileIO self) {
         @Specialization(guards = "!self.isClosed()")
         Object doit(VirtualFrame frame, PFileIO self,
                         @Cached PyObjectLookupAttr lookupName,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode repr) {
+                        @Cached("create(Repr)") LookupAndCallUnaryNode repr) {
             String mode = ModeNode.modeString(self);
             String closefd = self.isCloseFD() ? "True" : "False";
             Object nameobj = lookupName.execute(frame, self, "name");
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperBuiltins.java
@@ -1159,7 +1159,7 @@ abstract static class ReprNode extends InitCheckPythonUnaryBuiltinNode {
         @Specialization(guards = "self.isOK()")
         Object doit(VirtualFrame frame, PTextIO self,
                         @Cached PyObjectLookupAttr lookup,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode repr,
+                        @Cached("create(Repr)") LookupAndCallUnaryNode repr,
                         @Cached IONodes.ToStringNode toString,
                         @Cached IsBuiltinClassProfile isValueError) {
             if (!getContext().reprEnter(self)) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONEncoderBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONEncoderBuiltins.java
@@ -33,6 +33,7 @@
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
@@ -73,12 +74,12 @@ public abstract static class CallEncoderNode extends PythonTernaryClinicBuiltinN
         @Child private CallUnaryMethodNode callDefaultFn = CallUnaryMethodNode.create();
         @Child private CastToJavaStringNode castEncodeResult = CastToJavaStringNode.create();
         @Child private LookupAndCallUnaryNode callGetItems = LookupAndCallUnaryNode.create(SpecialMethodNames.ITEMS);
-        @Child private LookupAndCallUnaryNode callGetDictIter = LookupAndCallUnaryNode.create(SpecialMethodNames.__ITER__);
+        @Child private LookupAndCallUnaryNode callGetDictIter = LookupAndCallUnaryNode.create(SpecialMethodSlot.Iter);
         @Child private GetNextNode callDictNext = GetNextNode.create();
         @Child private IsBuiltinClassProfile stopDictIterationProfile = IsBuiltinClassProfile.create();
         @Child private HashingStorageLibrary dictLib = HashingStorageLibrary.getFactory().createDispatched(6);
         @Child private ListSortNode sortList = ListSortNode.create();
-        @Child private LookupAndCallUnaryNode callGetListIter = LookupAndCallUnaryNode.create(SpecialMethodNames.__ITER__);
+        @Child private LookupAndCallUnaryNode callGetListIter = LookupAndCallUnaryNode.create(SpecialMethodSlot.Iter);
         @Child private GetNextNode callListNext = GetNextNode.create();
         @Child private IsBuiltinClassProfile stopListIterationProfile = IsBuiltinClassProfile.create();
         @Child private GetClassNode getDictClass = GetClassNode.create();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java
@@ -437,7 +437,7 @@ static boolean contains(VirtualFrame frame, PArray self, Object value,
     abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
         static String repr(VirtualFrame frame, PArray self,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode reprNode,
+                        @Cached("create(Repr)") LookupAndCallUnaryNode reprNode,
                         @Cached ConditionProfile isEmptyProfile,
                         @Cached ConditionProfile isUnicodeProfile,
                         @Cached CastToJavaStringNode cast,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/FormatNodeBase.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/FormatNodeBase.java
@@ -59,7 +59,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
     // applies to all types: empty format string => use __str__
     @Specialization(guards = "formatString.isEmpty()")
     public static Object formatEmptyString(VirtualFrame frame, Object self, @SuppressWarnings("unused") String formatString,
-                    @Cached("create(__STR__)") LookupAndCallUnaryNode lookupAndCallNode) {
+                    @Cached("create(Str)") LookupAndCallUnaryNode lookupAndCallNode) {
         return lookupAndCallNode.executeObject(frame, self);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java
@@ -72,7 +72,6 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PNodeWithRaise;
 import com.oracle.graal.python.nodes.PRaiseNode;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.builtins.ListNodes;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.special.CallTernaryMethodNode;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictViewBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictViewBuiltins.java
@@ -83,7 +83,6 @@
 import com.oracle.graal.python.lib.PyObjectRichCompareBool;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
 import com.oracle.graal.python.nodes.PNodeWithContext;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
 import com.oracle.graal.python.nodes.expression.CoerceToBooleanNode;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignObjectBuiltins.java
@@ -89,6 +89,7 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.iterator.PForeignArrayIterator;
 import com.oracle.graal.python.builtins.objects.object.ObjectNodes;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.lib.PyObjectRichCompareBool;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
@@ -1027,7 +1028,6 @@ protected static long doIt(Object object,
     @Builtin(name = __STR__, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     abstract static class StrNode extends PythonUnaryBuiltinNode {
-        protected final String method = __STR__;
         @Child private LookupAndCallUnaryNode callStrNode;
         @Child private CastToListNode castToListNode;
         @Child private ObjectNodes.DefaultObjectReprNode defaultReprNode;
@@ -1130,7 +1130,7 @@ private static String createDisplayName(boolean isMetaObject, Object object) {
         private LookupAndCallUnaryNode getCallStrNode() {
             if (callStrNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callStrNode = insert(LookupAndCallUnaryNode.create(method));
+                callStrNode = insert(LookupAndCallUnaryNode.create(SpecialMethodSlot.Str));
             }
             return callStrNode;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java
@@ -2461,7 +2461,7 @@ private Object compute(Object cl, byte[] bytes, String byteorder, boolean signed
 
         @Specialization
         Object fromObject(VirtualFrame frame, Object cl, Object object, String byteorder, boolean signed,
-                        @Cached("create(__BYTES__)") LookupAndCallUnaryNode callBytes,
+                        @Cached("create(Bytes)") LookupAndCallUnaryNode callBytes,
                         @CachedLibrary(limit = "1") PythonBufferAccessLibrary bufferLib,
                         @Cached BytesNodes.BytesFromObject bytesFromObject) {
             byte[] bytes;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java
@@ -152,7 +152,7 @@ abstract static class ReprNode extends PythonUnaryBuiltinNode {
 
         @Specialization
         public Object repr(VirtualFrame frame, PList self,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode repr,
+                        @Cached("create(Repr)") LookupAndCallUnaryNode repr,
                         @Cached SequenceStorageNodes.LenNode lenNode,
                         @Cached SequenceStorageNodes.GetItemNode getItem) {
             SequenceStorage storage = self.getSequenceStorage();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/BufferBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/BufferBuiltins.java
@@ -93,7 +93,7 @@ abstract static class ReprNode extends PythonUnaryBuiltinNode {
 
         @Specialization
         static Object repr(VirtualFrame frame, PBuffer self,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode repr) {
+                        @Cached("create(Repr)") LookupAndCallUnaryNode repr) {
             return createReprString(repr.executeObject(frame, self.getDelegate()));
         }
 
@@ -147,7 +147,7 @@ public abstract static class LenNode extends PythonUnaryBuiltinNode {
 
         @Specialization
         public static Object len(VirtualFrame frame, PBuffer self,
-                        @Cached("create(__LEN__)") LookupAndCallUnaryNode callLenNode) {
+                        @Cached("create(Len)") LookupAndCallUnaryNode callLenNode) {
             return callLenNode.executeObject(frame, self.getDelegate());
         }
     }
@@ -158,7 +158,7 @@ public abstract static class IterNode extends PythonBuiltinNode {
 
         @Specialization
         static Object doPBuffer(VirtualFrame frame, PBuffer self,
-                        @Cached("create(__ITER__)") LookupAndCallUnaryNode callIterNode) {
+                        @Cached("create(Iter)") LookupAndCallUnaryNode callIterNode) {
             return callIterNode.executeObject(frame, self.getDelegate());
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -347,7 +347,7 @@ static Object notImplemented(Object self, Object other) {
     abstract static class StrNode extends PythonUnaryBuiltinNode {
         @Specialization
         static Object str(VirtualFrame frame, Object self,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode reprNode) {
+                        @Cached("create(Repr)") LookupAndCallUnaryNode reprNode) {
             return reprNode.executeObject(frame, self);
         }
     }
@@ -710,7 +710,7 @@ Object format(Object self, @SuppressWarnings("unused") String formatString) {
 
         @Specialization(guards = "formatString.isEmpty()")
         static Object format(VirtualFrame frame, Object self, @SuppressWarnings("unused") String formatString,
-                        @Cached("create(__STR__)") LookupAndCallUnaryNode strCall) {
+                        @Cached("create(Str)") LookupAndCallUnaryNode strCall) {
             return strCall.executeObject(frame, self);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/posix/DirEntryBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/posix/DirEntryBuiltins.java
@@ -124,7 +124,7 @@ abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
         static String repr(VirtualFrame frame, PDirEntry self,
                         @Cached NameNode nameNode,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode reprNode,
+                        @Cached("create(Repr)") LookupAndCallUnaryNode reprNode,
                         @Cached CastToJavaStringNode castToStringNode) {
             StringBuilder sb = PythonUtils.newStringBuilder("<DirEntry ");
             PythonUtils.append(sb, castToStringNode.execute(reprNode.executeObject(frame, nameNode.execute(frame, self))));
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/BaseSetBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/BaseSetBuiltins.java
@@ -127,7 +127,7 @@ private static void fillItems(VirtualFrame frame, StringBuilder sb, LookupAndCal
 
         @Specialization(limit = "3")
         public static Object repr(VirtualFrame frame, PBaseSet self,
-                        @Cached("create(__REPR__)") LookupAndCallUnaryNode repr,
+                        @Cached("create(Repr)") LookupAndCallUnaryNode repr,
                         @Cached TypeNodes.GetNameNode getNameNode,
                         @Cached GetClassNode getClassNode,
                         @CachedLibrary("self.getDictStorage()") HashingStorageLibrary hlib) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/SpecialMethodSlot.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/SpecialMethodSlot.java
@@ -146,11 +146,6 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 
-import com.sun.org.apache.xpath.internal.operations.And;
-import com.sun.org.apache.xpath.internal.operations.Mod;
-import com.sun.org.apache.xpath.internal.operations.Or;
-import jdk.internal.loader.AbstractClassLoaderValue.Sub;
-
 /**
  * Subset of special methods that is cached in {@link PythonManagedClass} and
  * {@link PythonBuiltinClassType}.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/GetAttributeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/GetAttributeNode.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallUnaryNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallUnaryNode.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/ContainsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/ContainsNode.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/DeleteItemNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/DeleteItemNode.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SetItemIfNotPresentNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SetItemIfNotPresentNode.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/CoerceToJavaLongNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/CoerceToJavaLongNode.java

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected ArgumentClinicProvider getArgumentClinic() {`
`59`	`59`	`// applies to all types: empty format string => use __str__`
`60`	`60`	`@Specialization(guards = "formatString.isEmpty()")`
`61`	`61`	`public static Object formatEmptyString(VirtualFrame frame, Object self, @SuppressWarnings("unused") String formatString,`
`62`		`- @Cached("create(__STR__)") LookupAndCallUnaryNode lookupAndCallNode) {`
	`62`	`+ @Cached("create(Str)") LookupAndCallUnaryNode lookupAndCallNode) {`
`63`	`63`	`return lookupAndCallNode.executeObject(frame, self);`
`64`	`64`	`}`
`65`	`65`	`}`