[GR-29334] Ensure native-image contains all needed deoptimization entrypoints.

PullRequest: graalpython/1606

Author: teshull

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

@@ -194,11 +194,6 @@ public interface GenNodeSupplier {
         GeneralizationNode getUncached();
     }
 
-    public interface ContainerFactory {
-
-        Object apply(SequenceStorage s, PythonObjectFactory factory);
-    }
-
     @GenerateUncached
     public abstract static class IsAssignCompatibleNode extends Node {
 
@@ -598,63 +593,60 @@ public static GetItemNode create(NormalizeIndexNode normalizeIndexNode, BiFuncti
     @ImportStatic(PGuards.class)
     public abstract static class GetItemDynamicNode extends Node {
 
-        public abstract Object execute(ContainerFactory factoryMethod, SequenceStorage s, Object key);
+        public abstract Object executeObject(SequenceStorage s, Object key);
 
         public final Object execute(SequenceStorage s, int key) {
-            return execute(null, s, key);
+            return executeObject(s, key);
         }
 
         public final Object execute(SequenceStorage s, long key) {
-            return execute(null, s, key);
+            return executeObject(s, key);
         }
 
         public final Object execute(SequenceStorage s, PInt key) {
-            return execute(null, s, key);
+            return executeObject(s, key);
         }
 
         @Specialization
-        protected static Object doScalarInt(@SuppressWarnings("unused") ContainerFactory factoryMethod, SequenceStorage storage, int idx,
+        protected static Object doScalarInt(SequenceStorage storage, int idx,
                         @Shared("getItemScalarNode") @Cached GetItemScalarNode getItemScalarNode,
                         @Shared("normalizeIndexNode") @Cached NormalizeIndexCustomMessageNode normalizeIndexNode,
                         @Shared("lenNode") @Cached LenNode lenNode) {
             return getItemScalarNode.execute(storage, normalizeIndexNode.execute(idx, lenNode.execute(storage), ErrorMessages.INDEX_OUT_OF_RANGE));
         }
 
         @Specialization
-        protected static Object doScalarLong(@SuppressWarnings("unused") ContainerFactory factoryMethod, SequenceStorage storage, long idx,
+        protected static Object doScalarLong(SequenceStorage storage, long idx,
                         @Shared("getItemScalarNode") @Cached GetItemScalarNode getItemScalarNode,
                         @Shared("normalizeIndexNode") @Cached NormalizeIndexCustomMessageNode normalizeIndexNode,
                         @Shared("lenNode") @Cached LenNode lenNode) {
             return getItemScalarNode.execute(storage, normalizeIndexNode.execute(idx, lenNode.execute(storage), ErrorMessages.INDEX_OUT_OF_RANGE));
         }
 
         @Specialization
-        protected static Object doScalarPInt(@SuppressWarnings("unused") ContainerFactory factoryMethod, SequenceStorage storage, PInt idx,
+        protected static Object doScalarPInt(SequenceStorage storage, PInt idx,
                         @Shared("getItemScalarNode") @Cached GetItemScalarNode getItemScalarNode,
                         @Shared("normalizeIndexNode") @Cached NormalizeIndexCustomMessageNode normalizeIndexNode,
                         @Shared("lenNode") @Cached LenNode lenNode) {
             return getItemScalarNode.execute(storage, normalizeIndexNode.execute(idx, lenNode.execute(storage), ErrorMessages.INDEX_OUT_OF_RANGE));
         }
 
         @Specialization(guards = "!isPSlice(idx)")
-        protected static Object doScalarGeneric(@SuppressWarnings("unused") ContainerFactory factoryMethod, SequenceStorage storage, Object idx,
+        protected static Object doScalarGeneric(SequenceStorage storage, Object idx,
                         @Shared("getItemScalarNode") @Cached GetItemScalarNode getItemScalarNode,
                         @Shared("normalizeIndexNode") @Cached NormalizeIndexCustomMessageNode normalizeIndexNode,
                         @Shared("lenNode") @Cached LenNode lenNode) {
             return getItemScalarNode.execute(storage, normalizeIndexNode.execute(idx, lenNode.execute(storage), ErrorMessages.INDEX_OUT_OF_RANGE));
         }
 
         @Specialization
-        protected static Object doSlice(ContainerFactory factoryMethod, SequenceStorage storage, PSlice slice,
+        @SuppressWarnings("unused")
+        protected static Object doSlice(SequenceStorage storage, PSlice slice,
                         @Cached GetItemSliceNode getItemSliceNode,
                         @Cached PythonObjectFactory factory,
                         @Cached CoerceToIntSlice sliceCast,
                         @Cached ComputeIndices compute,
                         @Cached LenOfRangeNode sliceLen) {
-            SliceInfo info = compute.execute(sliceCast.execute(slice), storage.length());
-            if (factoryMethod != null) {
-                return factoryMethod.apply(getItemSliceNode.execute(storage, info.start, info.stop, info.step, sliceLen.len(info)), factory);
-            }
             CompilerDirectives.transferToInterpreterAndInvalidate();
             throw new IllegalStateException();
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

@@ -1502,18 +1502,12 @@ static Long getItemsizeManaged(PythonClass cls,
             if (hasValueProfile.profile(itemsize != PNone.NO_VALUE)) {
                 return (long) itemsize;
             }
-            itemsize = computeItemSize(cls, getBaseNode, baseItemsizeNode);
-            writeNode.execute(cls, TYPE_ITEMSIZE, itemsize);
-            return (long) itemsize;
-        }
 
-        private static Long computeItemSize(PythonManagedClass cls, GetBaseClassNode getBaseNode, GetItemsizeNode baseItemsizeNode) {
-            if (cls instanceof PythonBuiltinClass) {
-                return getItemsizeType(((PythonBuiltinClass) cls).getType());
-            }
             Object base = getBaseNode.execute(cls);
             assert base != null;
-            return baseItemsizeNode.execute(base);
+            itemsize = baseItemsizeNode.execute(base);
+            writeNode.execute(cls, TYPE_ITEMSIZE, itemsize);
+            return (long) itemsize;
         }
 
         @Specialization