Pass SpecialMethodSlot to the factory methods of LookupAndCall{Binary|Ternary}Node instead of a String

steve-s · steve-s · commit 6d14d4c40160 · 2021-12-01T17:22:24.000+01:00
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
@@ -1411,7 +1411,7 @@ private static TriState isInstanceCheckInternal(VirtualFrame frame, Object insta
 
         @Specialization(guards = "isPythonClass(cls)")
         static boolean isInstance(VirtualFrame frame, Object instance, Object cls,
-                        @Shared("instanceCheck") @Cached("create(__INSTANCECHECK__)") LookupAndCallBinaryNode instanceCheckNode,
+                        @Shared("instanceCheck") @Cached("create(InstanceCheck)") LookupAndCallBinaryNode instanceCheckNode,
                         @Shared("boolCast") @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode,
                         @Cached GetClassNode getClassNode,
                         @Cached TypeNodes.IsSameTypeNode isSameTypeNode,
@@ -1423,7 +1423,7 @@ static boolean isInstance(VirtualFrame frame, Object instance, Object cls,
 
         @Specialization(guards = {"!isPTuple(cls)", "!isPythonClass(cls)"})
         static boolean isInstance(VirtualFrame frame, Object instance, Object cls,
-                        @Shared("instanceCheck") @Cached("create(__INSTANCECHECK__)") LookupAndCallBinaryNode instanceCheckNode,
+                        @Shared("instanceCheck") @Cached("create(InstanceCheck)") LookupAndCallBinaryNode instanceCheckNode,
                         @Shared("boolCast") @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode,
                         @Cached TypeBuiltins.InstanceCheckNode typeInstanceCheckNode) {
             TriState check = isInstanceCheckInternal(frame, instance, cls, instanceCheckNode, castToBooleanNode);
@@ -1459,7 +1459,7 @@ private static boolean isSubclassCheckInternal(VirtualFrame frame, Object derive
 
         @Specialization(guards = "!isPTuple(cls)")
         static boolean isSubclass(VirtualFrame frame, Object derived, Object cls,
-                        @Cached("create(__SUBCLASSCHECK__)") LookupAndCallBinaryNode subclassCheckNode,
+                        @Cached("create(Subclasscheck)") LookupAndCallBinaryNode subclassCheckNode,
                         @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode,
                         @Cached IsSubtypeNode isSubtypeNode) {
             return isSubclassCheckInternal(frame, derived, cls, subclassCheckNode, castToBooleanNode) || isSubtypeNode.execute(frame, derived, cls);
@@ -1885,13 +1885,13 @@ public abstract static class FormatNode extends PythonBinaryBuiltinNode {
 
         @Specialization(guards = "isNoValue(formatSpec)")
         Object format(VirtualFrame frame, Object obj, @SuppressWarnings("unused") PNone formatSpec,
-                        @Shared("callFormat") @Cached("create(__FORMAT__)") LookupAndCallBinaryNode callFormat) {
+                        @Shared("callFormat") @Cached("create(Format)") LookupAndCallBinaryNode callFormat) {
             return format(frame, obj, "", callFormat);
         }
 
         @Specialization(guards = "!isNoValue(formatSpec)")
         Object format(VirtualFrame frame, Object obj, Object formatSpec,
-                        @Shared("callFormat") @Cached("create(__FORMAT__)") LookupAndCallBinaryNode callFormat) {
+                        @Shared("callFormat") @Cached("create(Format)") LookupAndCallBinaryNode callFormat) {
             Object res = callFormat.executeObject(frame, obj, formatSpec);
             if (res == NO_VALUE) {
                 throw raise(TypeError, ErrorMessages.TYPE_DOESNT_DEFINE_FORMAT, obj);
@@ -1921,7 +1921,7 @@ public static String ascii(VirtualFrame frame, Object obj,
     public abstract static class RoundNode extends PythonBuiltinNode {
         @Specialization
         Object round(VirtualFrame frame, Object x, @SuppressWarnings("unused") PNone n,
-                        @Cached("create(__ROUND__)") LookupAndCallUnaryNode callRound) {
+                        @Cached("create(Round)") LookupAndCallUnaryNode callRound) {
             Object result = callRound.executeObject(frame, x);
             if (result == PNone.NO_VALUE) {
                 throw raise(TypeError, ErrorMessages.TYPE_DOESNT_DEFINE_METHOD, x, __ROUND__);
@@ -1931,7 +1931,7 @@ Object round(VirtualFrame frame, Object x, @SuppressWarnings("unused") PNone n,
 
         @Specialization(guards = "!isPNone(n)")
         Object round(VirtualFrame frame, Object x, Object n,
-                        @Cached("create(__ROUND__)") LookupAndCallBinaryNode callRound) {
+                        @Cached("create(Round)") LookupAndCallBinaryNode callRound) {
             Object result = callRound.executeObject(frame, x, n);
             if (result == NOT_IMPLEMENTED) {
                 throw raise(TypeError, ErrorMessages.TYPE_DOESNT_DEFINE_METHOD, x, __ROUND__);
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
@@ -3392,7 +3392,7 @@ PTuple doRepr(VirtualFrame frame, Object module, double val, int formatCode, int
 
         @Specialization(guards = "!isReprFormatCode(formatCode)")
         Object doGeneric(VirtualFrame frame, Object module, double val, int formatCode, int precision, @SuppressWarnings("unused") int flags,
-                        @Cached("create(__FORMAT__)") LookupAndCallBinaryNode callReprNode,
+                        @Cached("create(Format)") LookupAndCallBinaryNode callReprNode,
                         @Cached CastToJavaStringNode castToStringNode,
                         @Cached GetNativeNullNode getNativeNullNode) {
             try {
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
@@ -300,14 +300,14 @@ Object getItem(VirtualFrame frame, PDict self, Object key,
         }
     }
 
-    @ImportStatic(SpecialMethodNames.class)
+    @ImportStatic(SpecialMethodSlot.class)
     protected abstract static class DispatchMissingNode extends Node {
 
         protected abstract Object execute(VirtualFrame frame, Object self, Object key);
 
         @Specialization
         protected static Object misssing(VirtualFrame frame, Object self, Object key,
-                        @Cached("create(__MISSING__)") LookupAndCallBinaryNode callMissing,
+                        @Cached("create(Missing)") LookupAndCallBinaryNode callMissing,
                         @Cached DefaultMissingNode defaultMissing) {
             Object result = callMissing.executeObject(frame, self, key);
             if (result == PNotImplemented.NOT_IMPLEMENTED) {
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
@@ -78,6 +78,7 @@
 import com.oracle.graal.python.builtins.objects.set.PSet;
 import com.oracle.graal.python.builtins.objects.set.SetNodes;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.lib.PyObjectGetIter;
 import com.oracle.graal.python.lib.PyObjectRichCompareBool;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
@@ -282,7 +283,7 @@ private GetNextNode getNext() {
         private LookupAndCallBinaryNode getContains() {
             if (contains == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                contains = insert(LookupAndCallBinaryNode.create(SpecialMethodNames.__CONTAINS__));
+                contains = insert(LookupAndCallBinaryNode.create(SpecialMethodSlot.Contains));
             }
             return contains;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java
@@ -487,7 +487,7 @@ private double doOperation(double left, double right, BranchProfile negativeRais
 
         @Specialization(rewriteOn = UnexpectedResultException.class)
         double doDD(VirtualFrame frame, double left, double right, @SuppressWarnings("unused") PNone none,
-                        @Shared("powCall") @Cached("create(__POW__)") LookupAndCallTernaryNode callPow,
+                        @Shared("powCall") @Cached("create(Pow)") LookupAndCallTernaryNode callPow,
                         @Shared("negativeRaise") @Cached BranchProfile negativeRaise) throws UnexpectedResultException {
             if (doSpecialCases(left, right, negativeRaise) == 1) {
                 return 1.0;
@@ -502,7 +502,7 @@ private double doOperation(double left, double right, BranchProfile negativeRais
 
         @Specialization(replaces = "doDD")
         Object doDDToComplex(VirtualFrame frame, double left, double right, PNone none,
-                        @Shared("powCall") @Cached("create(__POW__)") LookupAndCallTernaryNode callPow,
+                        @Shared("powCall") @Cached("create(Pow)") LookupAndCallTernaryNode callPow,
                         @Shared("negativeRaise") @Cached BranchProfile negativeRaise) {
             if (doSpecialCases(left, right, negativeRaise) == 1) {
                 return 1.0;
@@ -516,28 +516,28 @@ Object doDDToComplex(VirtualFrame frame, double left, double right, PNone none,
 
         @Specialization(rewriteOn = UnexpectedResultException.class)
         double doDL(VirtualFrame frame, long left, double right, PNone none,
-                        @Shared("powCall") @Cached("create(__POW__)") LookupAndCallTernaryNode callPow,
+                        @Shared("powCall") @Cached("create(Pow)") LookupAndCallTernaryNode callPow,
                         @Shared("negativeRaise") @Cached BranchProfile negativeRaise) throws UnexpectedResultException {
             return doDD(frame, left, right, none, callPow, negativeRaise);
         }
 
         @Specialization(replaces = "doDL")
         Object doDLComplex(VirtualFrame frame, long left, double right, PNone none,
-                        @Shared("powCall") @Cached("create(__POW__)") LookupAndCallTernaryNode callPow,
+                        @Shared("powCall") @Cached("create(Pow)") LookupAndCallTernaryNode callPow,
                         @Shared("negativeRaise") @Cached BranchProfile negativeRaise) {
             return doDDToComplex(frame, left, right, none, callPow, negativeRaise);
         }
 
         @Specialization(rewriteOn = UnexpectedResultException.class)
         double doDPi(VirtualFrame frame, PInt left, double right, @SuppressWarnings("unused") PNone none,
-                        @Shared("powCall") @Cached("create(__POW__)") LookupAndCallTernaryNode callPow,
+                        @Shared("powCall") @Cached("create(Pow)") LookupAndCallTernaryNode callPow,
                         @Shared("negativeRaise") @Cached BranchProfile negativeRaise) throws UnexpectedResultException {
             return doDD(frame, left.doubleValueWithOverflow(getRaiseNode()), right, none, callPow, negativeRaise);
         }
 
         @Specialization(replaces = "doDPi")
         Object doDPiToComplex(VirtualFrame frame, PInt left, double right, @SuppressWarnings("unused") PNone none,
-                        @Shared("powCall") @Cached("create(__POW__)") LookupAndCallTernaryNode callPow,
+                        @Shared("powCall") @Cached("create(Pow)") LookupAndCallTernaryNode callPow,
                         @Shared("negativeRaise") @Cached BranchProfile negativeRaise) {
             return doDDToComplex(frame, left.doubleValueWithOverflow(getRaiseNode()), right, none, callPow, negativeRaise);
         }
@@ -546,7 +546,7 @@ Object doDPiToComplex(VirtualFrame frame, PInt left, double right, @SuppressWarn
         Object doGeneric(VirtualFrame frame, Object left, Object right, Object mod,
                         @Cached CanBeDoubleNode canBeDoubleNode,
                         @Cached PyFloatAsDoubleNode asDoubleNode,
-                        @Shared("powCall") @Cached("create(__POW__)") LookupAndCallTernaryNode callPow,
+                        @Shared("powCall") @Cached("create(Pow)") LookupAndCallTernaryNode callPow,
                         @Shared("negativeRaise") @Cached BranchProfile negativeRaise) {
             if (!(mod instanceof PNone)) {
                 throw raise(PythonBuiltinClassType.TypeError, "pow() 3rd argument not allowed unless all arguments are integers");
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorBuiltins.java
@@ -243,7 +243,7 @@ Object next(VirtualFrame frame, PSequenceIterator self,
 
         @Specialization(guards = {"!self.isExhausted()", "!self.isPSequence()"})
         Object next(VirtualFrame frame, PSequenceIterator self,
-                        @Cached("create(__GETITEM__)") LookupAndCallBinaryNode callGetItem,
+                        @Cached("create(GetItem)") LookupAndCallBinaryNode callGetItem,
                         @Cached IsBuiltinClassProfile profile) {
             try {
                 return callGetItem.executeObject(frame, self.getObject(), self.index++);
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
@@ -110,25 +110,25 @@ public abstract static class GetItemNode extends PythonBinaryBuiltinNode {
 
         @Specialization
         public static Object iter(VirtualFrame frame, PBuffer self, boolean key,
-                        @Cached("create(__GETITEM__)") LookupAndCallBinaryNode callGetItemNode) {
+                        @Cached("create(GetItem)") LookupAndCallBinaryNode callGetItemNode) {
             return callGetItemNode.executeObject(frame, self.getDelegate(), key);
         }
 
         @Specialization
         public static Object iter(VirtualFrame frame, PBuffer self, int key,
-                        @Cached("create(__GETITEM__)") LookupAndCallBinaryNode callGetItemNode) {
+                        @Cached("create(GetItem)") LookupAndCallBinaryNode callGetItemNode) {
             return callGetItemNode.executeObject(frame, self.getDelegate(), key);
         }
 
         @Specialization
         public static Object iter(VirtualFrame frame, PBuffer self, long key,
-                        @Cached("create(__GETITEM__)") LookupAndCallBinaryNode callGetItemNode) {
+                        @Cached("create(GetItem)") LookupAndCallBinaryNode callGetItemNode) {
             return callGetItemNode.executeObject(frame, self.getDelegate(), key);
         }
 
         @Specialization
         public static Object iter(VirtualFrame frame, PBuffer self, PInt key,
-                        @Cached("create(__GETITEM__)") LookupAndCallBinaryNode callGetItemNode) {
+                        @Cached("create(GetItem)") LookupAndCallBinaryNode callGetItemNode) {
             return callGetItemNode.executeObject(frame, self.getDelegate(), key);
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/MethodBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/MethodBuiltins.java
@@ -93,7 +93,7 @@ protected Object doIt(PMethod self) {
     public abstract static class CodeNode extends PythonBuiltinNode {
         @Specialization
         protected Object doIt(VirtualFrame frame, PMethod self,
-                        @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode getCode) {
+                        @Cached("create(GetAttribute)") LookupAndCallBinaryNode getCode) {
             return getCode.executeObject(frame, self.getFunction(), __CODE__);
         }
     }
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
@@ -315,7 +315,7 @@ static boolean ne(PythonAbstractNativeObject self, PythonAbstractNativeObject ot
         Object ne(VirtualFrame frame, Object self, Object other) {
             if (eqNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                eqNode = insert(LookupAndCallBinaryNode.create(__EQ__));
+                eqNode = insert(LookupAndCallBinaryNode.create(SpecialMethodSlot.Eq));
             }
             Object result = eqNode.executeObject(frame, self, other);
             if (result == PNotImplemented.NOT_IMPLEMENTED) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/reversed/ReversedBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/reversed/ReversedBuiltins.java
@@ -85,7 +85,7 @@ public Object exhausted(@SuppressWarnings("unused") PBuiltinIterator self) {
 
         @Specialization(guards = "!self.isExhausted()")
         Object next(VirtualFrame frame, PSequenceReverseIterator self,
-                        @Cached("create(__GETITEM__)") LookupAndCallBinaryNode callGetItem,
+                        @Cached("create(GetItem)") LookupAndCallBinaryNode callGetItem,
                         @Cached IsBuiltinClassProfile profile) {
             if (self.index >= 0) {
                 try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java
@@ -342,7 +342,7 @@ private TypeNodes.IsTypeNode ensureIsTypeNode() {
         private LookupAndCallBinaryNode getGetAttr() {
             if (getAttrNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                getAttrNode = insert(LookupAndCallBinaryNode.create(SpecialMethodNames.__GETATTRIBUTE__));
+                getAttrNode = insert(LookupAndCallBinaryNode.create(SpecialMethodSlot.GetAttribute));
             }
             return getAttrNode;
         }
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
@@ -98,6 +98,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RMOD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RMUL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ROR__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__ROUND__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RPOW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RRSHIFT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RSHIFT__;
@@ -145,6 +146,11 @@
 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}.
@@ -250,6 +256,7 @@ public enum SpecialMethodSlot {
     RLShift(__RLSHIFT__),
     RShift(__RSHIFT__),
     RRShift(__RRSHIFT__),
+    Round(__ROUND__),
 
     IAdd(__IADD__),
     IMul(__IMUL__),
@@ -823,6 +830,8 @@ public static SpecialMethodSlot findSpecialSlot(String name) {
                 return RShift;
             case __RRSHIFT__:
                 return RRShift;
+            case __ROUND__:
+                return Round;
             case __IADD__:
                 return IAdd;
             case __IMUL__:
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java
@@ -861,7 +861,7 @@ static Object doNative(PythonNativeClass self,
     @Builtin(name = __INSTANCECHECK__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class InstanceCheckNode extends PythonBinaryBuiltinNode {
-        @Child private LookupAndCallBinaryNode getAttributeNode = LookupAndCallBinaryNode.create(__GETATTRIBUTE__);
+        @Child private LookupAndCallBinaryNode getAttributeNode = LookupAndCallBinaryNode.create(SpecialMethodSlot.GetAttribute);
         @Child private AbstractObjectIsSubclassNode abstractIsSubclassNode = AbstractObjectIsSubclassNode.create();
         @Child private AbstractObjectGetBasesNode getBasesNode = AbstractObjectGetBasesNode.create();
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/DeleteAttributeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/DeleteAttributeNode.java
@@ -63,7 +63,7 @@ public static DeleteAttributeNode create(ExpressionNode object, ExpressionNode k
 
     @Specialization
     protected void doIt(VirtualFrame frame, Object object, Object key,
-                    @Cached("create(__DELATTR__)") LookupAndCallBinaryNode call) {
+                    @Cached("create(DelAttr)") LookupAndCallBinaryNode call) {
         call.executeObject(frame, object, key);
     }
 }
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
@@ -114,7 +114,7 @@ public ExpressionNode getObject() {
 
     abstract static class GetAttributeBaseNode extends Node {
 
-        @Child protected LookupAndCallBinaryNode dispatchNode = LookupAndCallBinaryNode.create(__GETATTRIBUTE__);
+        @Child protected LookupAndCallBinaryNode dispatchNode = LookupAndCallBinaryNode.create(SpecialMethodSlot.GetAttribute);
         @Child private IsBuiltinClassProfile isBuiltinClassProfile;
 
         @Child private LookupSpecialMethodSlotNode lookupGetattrNode;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/SetAttributeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/SetAttributeNode.java
@@ -102,7 +102,7 @@ public ExpressionNode getPrimaryNode() {
 
     @Specialization
     protected void doIt(VirtualFrame frame, Object object, Object value,
-                    @Cached("create(__SETATTR__)") LookupAndCallTernaryNode call) {
+                    @Cached("create(SetAttr)") LookupAndCallTernaryNode call) {
         call.execute(frame, object, key, value);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallTernaryNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallTernaryNode.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/AbstractObjectGetBasesNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/AbstractObjectGetBasesNode.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/GetItemNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/GetItemNode.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

Original file line number	Diff line number	Diff line change
`@@ -300,14 +300,14 @@ Object getItem(VirtualFrame frame, PDict self, Object key,`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`
`303`		`- @ImportStatic(SpecialMethodNames.class)`
	`303`	`+ @ImportStatic(SpecialMethodSlot.class)`
`304`	`304`	`protected abstract static class DispatchMissingNode extends Node {`
`305`	`305`
`306`	`306`	`protected abstract Object execute(VirtualFrame frame, Object self, Object key);`
`307`	`307`
`308`	`308`	`@Specialization`
`309`	`309`	`protected static Object misssing(VirtualFrame frame, Object self, Object key,`
`310`		`- @Cached("create(__MISSING__)") LookupAndCallBinaryNode callMissing,`
	`310`	`+ @Cached("create(Missing)") LookupAndCallBinaryNode callMissing,`
`311`	`311`	`@Cached DefaultMissingNode defaultMissing) {`
`312`	`312`	`Object result = callMissing.executeObject(frame, self, key);`
`313`	`313`	`if (result == PNotImplemented.NOT_IMPLEMENTED) {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ protected Object doIt(PMethod self) {`
`93`	`93`	`public abstract static class CodeNode extends PythonBuiltinNode {`
`94`	`94`	`@Specialization`
`95`	`95`	`protected Object doIt(VirtualFrame frame, PMethod self,`
`96`		`- @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode getCode) {`
	`96`	`+ @Cached("create(GetAttribute)") LookupAndCallBinaryNode getCode) {`
`97`	`97`	`return getCode.executeObject(frame, self.getFunction(), __CODE__);`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ static boolean ne(PythonAbstractNativeObject self, PythonAbstractNativeObject ot`
`315`	`315`	`Object ne(VirtualFrame frame, Object self, Object other) {`
`316`	`316`	`if (eqNode == null) {`
`317`	`317`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`318`		`- eqNode = insert(LookupAndCallBinaryNode.create(__EQ__));`
	`318`	`+ eqNode = insert(LookupAndCallBinaryNode.create(SpecialMethodSlot.Eq));`
`319`	`319`	`}`
`320`	`320`	`Object result = eqNode.executeObject(frame, self, other);`
`321`	`321`	`if (result == PNotImplemented.NOT_IMPLEMENTED) {`