split GetItemScalarNode into managed and native parts to aid inlining

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

@@ -279,6 +279,7 @@ abstract static class SequenceStorageBaseNode extends PNodeWithContext {
         protected static final int MAX_SEQUENCE_STORAGES = 9;
         protected static final int MAX_ARRAY_STORAGES = 7;
 
+        @InliningCutoff
         protected static boolean isByteStorage(NativeSequenceStorage store) {
             return store.getElementType() == ListStorageType.Byte;
         }
@@ -694,6 +695,18 @@ protected static Object doMro(MroSequenceStorage storage, int idx) {
         }
 
         @InliningCutoff
+        @Specialization
+        protected static Object doNative(NativeSequenceStorage storage, int idx,
+                        @Cached GetNativeItemScalarNode getItem) {
+            return getItem.execute(storage, idx);
+        }
+    }
+
+    @GenerateUncached
+    @ImportStatic(SequenceStorageBaseNode.class)
+    protected abstract static class GetNativeItemScalarNode extends Node {
+        public abstract Object execute(NativeSequenceStorage s, int idx);
+
         @Specialization(guards = "isObject(getElementType, storage)", limit = "1")
         protected static Object doNativeObject(NativeSequenceStorage storage, int idx,
                         @CachedLibrary("storage.getPtr()") InteropLibrary lib,
@@ -712,7 +725,6 @@ protected static Object doNativeObject(NativeSequenceStorage storage, int idx,
             }
         }
 
-        @InliningCutoff
         @Specialization(guards = "isByteStorage(storage)", limit = "1")
         protected static int doNativeByte(NativeSequenceStorage storage, int idx,
                         @CachedLibrary("storage.getPtr()") InteropLibrary lib,
@@ -724,7 +736,6 @@ protected static int doNativeByte(NativeSequenceStorage storage, int idx,
             return (byte) result & 0xFF;
         }
 
-        @InliningCutoff
         @Specialization(guards = {"!isByteStorage(storage)", "!isObject(getElementType, storage)"}, limit = "1")
         protected static Object doNative(NativeSequenceStorage storage, int idx,
                         @CachedLibrary("storage.getPtr()") InteropLibrary lib,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java

@@ -347,7 +347,7 @@ protected Object doInBounds(PList self, int index,
         }
 
         @InliningCutoff
-        @Specialization(guards = "indexCheckNode.execute(key) || isPSlice(key)", limit = "1")
+        @Specialization(guards = "isIndexOrSlice(indexCheckNode, key)", limit = "1")
         protected Object doScalar(VirtualFrame frame, PList self, Object key,
                         @SuppressWarnings("unused") @Cached PyIndexCheckNode indexCheckNode,
                         @Cached("createGetItemNode()") SequenceStorageNodes.GetItemNode getItemNode) {
@@ -356,11 +356,17 @@ protected Object doScalar(VirtualFrame frame, PList self, Object key,
 
         @InliningCutoff
         @SuppressWarnings("unused")
-        @Fallback
-        public Object doListError(VirtualFrame frame, Object self, Object key) {
+        @Specialization(guards = "!isIndexOrSlice(indexCheckNode, key)")
+        public Object doListError(VirtualFrame frame, Object self, Object key,
+                        @SuppressWarnings("unused") @Cached PyIndexCheckNode indexCheckNode) {
             throw raise(TypeError, ErrorMessages.OBJ_INDEX_MUST_BE_INT_OR_SLICES, "list", key);
         }
 
+        @InliningCutoff
+        protected static boolean isIndexOrSlice(PyIndexCheckNode indexCheckNode, Object key) {
+            return indexCheckNode.execute(key) || PGuards.isPSlice(key);
+        }
+
         protected static SequenceStorageNodes.GetItemNode createGetItemNode() {
             return SequenceStorageNodes.GetItemNode.create(NormalizeIndexNode.forList(), (s, f) -> f.createList(s));
         }