[GR-13467] GetItemNode should raise TypeError not return NotImplemented value

PullRequest: graalpython/370

Author: ppisl

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -37,3 +37,12 @@ def test_divmod_complex(self):
         self.assertRaises(TypeError, divmod, c1, c2)
         self.assertRaises(TypeError, divmod, 10, c2)
         self.assertRaises(TypeError, divmod, c1, 10)
+
+    def test_getitem_typeerror(self):
+        a = object()
+        try:
+            a[1]
+        except TypeError :
+            pass
+        else:
+            self.assertTrue(False)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -32,14 +32,17 @@
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.frame.ReadNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
-import com.oracle.truffle.api.dsl.Cached;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
 @NodeInfo(shortName = __GETITEM__)
 public abstract class GetItemNode extends BinaryOpNode implements ReadNode {
 
+    @Child private LookupAndCallBinaryNode callGetitemNode;
+
     public ExpressionNode getPrimary() {
         return getLeftNode();
     }
@@ -53,8 +56,16 @@ public ExpressionNode getSlice() {
     public abstract Object execute(Object primary, Object slice);
 
     @Specialization
-    public Object doSpecialObject(Object primary, Object index,
-                    @Cached("create(__GETITEM__)") LookupAndCallBinaryNode callGetitemNode) {
+    public Object doSpecialObject(Object primary, Object index) {
+        if (callGetitemNode == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            callGetitemNode = insert(LookupAndCallBinaryNode.create(__GETITEM__, null, () -> new LookupAndCallBinaryNode.NotImplementedHandler() {
+                @Override
+                public Object execute(Object arg, @SuppressWarnings("unused") Object arg2) {
+                    throw raise(TypeError, "'%p' object is not subscriptable", arg);
+                }
+            }));
+        }
         return callGetitemNode.executeObject(primary, index);
     }