locals only need __getitem__

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_exec.py

@@ -301,3 +301,13 @@ def f(a):
 
     def test_locals_is_globals(self):
         exec("assert locals() is globals()", globals())
+
+    def test_custom_locals2(self):
+        class M(object):
+            def __getitem__(self, key):
+                return key
+        m = M()
+        ns = {}
+        exec("global x; x = y", ns, m)
+        assert ns["x"] == "y";
+        assert eval("x", None, m) == "x"

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -475,7 +475,6 @@ public abstract static class EvalNode extends PythonBuiltinNode {
         @Child protected CompileNode compileNode = CompileNode.create();
         @Child private IndirectCallNode indirectCallNode = IndirectCallNode.create();
         @Child private HasInheritedAttributeNode hasGetItemNode;
-        @Child private HasInheritedAttributeNode hasSetItemNode;
 
         private HasInheritedAttributeNode getHasGetItemNode() {
             if (hasGetItemNode == null) {
@@ -485,24 +484,13 @@ private HasInheritedAttributeNode getHasGetItemNode() {
             return hasGetItemNode;
         }
 
-        private HasInheritedAttributeNode getHasSetItemNode() {
-            if (hasSetItemNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                hasSetItemNode = insert(HasInheritedAttributeNode.create(SpecialMethodNames.__SETITEM__));
-            }
-            return hasSetItemNode;
-        }
-
         protected boolean isMapping(Object object) {
-            // tfel: it seems that CPython only checks that there is __getitem__ and __setitem__
+            // tfel: it seems that CPython only checks that there is __getitem__
             if (object instanceof PDict) {
                 return true;
             } else {
-                if (getHasGetItemNode().execute(object)) {
-                    return getHasSetItemNode().execute(object);
-                }
+                return getHasGetItemNode().execute(object);
             }
-            return false;
         }
 
         protected boolean isAnyNone(Object object) {