Improve implementation of 'PyTuple_GetItem'.

Author: fangerer

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

@@ -40,8 +40,9 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.IndexError;
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.SystemError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
 import java.math.BigInteger;
@@ -143,6 +144,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -2059,4 +2061,27 @@ int doI(PythonClass a, PythonClass b) {
         }
     }
 
+    @Builtin(name = "PyTuple_GetItem", fixedNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    abstract static class PyTuple_GetItem extends PythonBinaryBuiltinNode {
+
+        @Specialization
+        Object doPTuple(PTuple tuple, long key,
+                        @Cached("create()") SequenceStorageNodes.LenNode lenNode,
+                        @Cached("createNotNormalized()") SequenceStorageNodes.GetItemNode getItemNode) {
+            SequenceStorage sequenceStorage = tuple.getSequenceStorage();
+            // we must do a bounds-check but we must not normalize the index
+            if (key < 0 || key >= lenNode.execute(sequenceStorage)) {
+                throw raise(IndexError, NormalizeIndexNode.TUPLE_OUT_OF_BOUNDS);
+            }
+            return getItemNode.execute(sequenceStorage, key);
+        }
+
+        @Fallback
+        Object doPTuple(Object tuple, @SuppressWarnings("unused") Object key) {
+            // TODO(fa) To be absolutely correct, we need to do a 'isinstance' check on the object.
+            throw raise(SystemError, "bad argument to internal function, was '%s' (type '%p')", tuple, tuple);
+        }
+    }
+
 }

graalpython/lib-graalpython/python_cext.py

@@ -812,13 +812,6 @@ def PyTuple_New(size):
     return (None,) * size
 
 
-@may_raise
-def PyTuple_GetItem(t, n):
-    if not isinstance(t, tuple):
-        __bad_internal_call(None, None, t)
-    return t[n]
-
-
 @may_raise(-1)
 def PyTuple_Size(t):
     if not isinstance(t, tuple):