Avoid capturing frame in annonymous class in GetItemNode

Author: steve-s

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

@@ -78,7 +78,7 @@
 public abstract class LookupAndCallBinaryNode extends Node {
 
     public abstract static class NotImplementedHandler extends PNodeWithContext {
-        public abstract Object execute(Object arg, Object arg2);
+        public abstract Object execute(VirtualFrame frame, Object arg, Object arg2);
     }
 
     protected final String name;
@@ -367,7 +367,7 @@ Object callObject(VirtualFrame frame, Object left, Object right,
         Object leftCallable = getattr.execute(frame, leftClass, leftValue);
         if (leftCallable == PNone.NO_VALUE) {
             if (handlerFactory != null) {
-                return runErrorHandler(leftValue, right);
+                return runErrorHandler(frame, leftValue, right);
             } else {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
@@ -428,7 +428,7 @@ Object callObjectR(VirtualFrame frame, Object left, Object right,
             result = ensureReverseDispatch().executeObject(frame, rightCallable, rightValue, leftValue);
         }
         if (handlerFactory != null && result == PNotImplemented.NOT_IMPLEMENTED) {
-            return runErrorHandler(leftValue, rightValue);
+            return runErrorHandler(frame, leftValue, rightValue);
         }
         return result;
     }
@@ -445,12 +445,12 @@ Object callObjectRUncached(VirtualFrame frame, Object left, Object right,
         return callObjectR(frame, left, right, getattr, getattrR, libLeft, libRight, isSameTypeNode, isSubtype, notImplementedBranch);
     }
 
-    private Object runErrorHandler(Object left, Object right) {
+    private Object runErrorHandler(VirtualFrame frame, Object left, Object right) {
         if (handler == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             handler = insert(handlerFactory.get());
         }
-        return handler.execute(left, right);
+        return handler.execute(frame, left, right);
     }
 
     public String getName() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java

@@ -79,7 +79,7 @@ public enum BinaryArithmetic {
         this.operator = operator;
         this.notImplementedHandler = () -> new NotImplementedHandler() {
             @Override
-            public Object execute(Object arg, Object arg2) {
+            public Object execute(VirtualFrame frame, Object arg, Object arg2) {
                 throw PRaiseNode.getUncached().raise(TypeError, ErrorMessages.UNSUPPORTED_OPERAND_TYPES_FOR_S_P_AND_P, operator, arg, arg2);
             }
         };

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/DeleteItemNode.java

@@ -76,7 +76,7 @@ public DeleteItemNode() {
             @Child private PRaiseNode raiseNode = PRaiseNode.create();
 
             @Override
-            public Object execute(Object arg, Object arg2) {
+            public Object execute(VirtualFrame frame, Object arg, Object arg2) {
                 throw raiseNode.raise(TypeError, ErrorMessages.OBJ_DOESNT_SUPPORT_DELETION, arg);
             }
         };

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/GetItemNode.java

@@ -134,7 +134,7 @@ Object doAnyObject(VirtualFrame frame, Object primary, Object index) {
                 @Child private GetAttributeNode getClassGetItemNode;
 
                 @Override
-                public Object execute(Object arg, Object arg2) {
+                public Object execute(VirtualFrame frame, Object arg, Object arg2) {
                     if (PGuards.isPythonClass(arg)) {
                         if (getClassGetItemNode == null) {
                             CompilerDirectives.transferToInterpreterAndInvalidate();