Use 'ListGeneralizationNode' instead of 'storage.generalizeFor'.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java

@@ -50,6 +50,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.modules.MathGuards;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ListGeneralizationNode;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
@@ -467,14 +468,16 @@ Object doGeneric(Object object) {
     @ImportStatic({PGuards.class, SpecialMethodNames.class})
     public abstract static class SetSliceNode extends PBaseNode {
 
+        @Child private ListGeneralizationNode genNode;
+
         public abstract PNone execute(PList list, PSlice slice, Object value);
 
         @Specialization(guards = {"isPTuple(value)", "isEmptyStorage(list)"})
         public PNone doPListEmptyTupleValue(PList list, PSlice slice, PSequence value,
                         @Cached("createBinaryProfile()") ConditionProfile wrongLength) {
             if (value.len() > 0) {
                 PList pvalue = factory().createList(((PTuple) value).getArray());
-                SequenceStorage newStorage = list.getSequenceStorage().generalizeFor(pvalue.getSequenceStorage().getIndicativeValue(), pvalue.getSequenceStorage());
+                SequenceStorage newStorage = getGenNode().execute(list.getSequenceStorage(), pvalue.getSequenceStorage().getIndicativeValue());
                 list.setSequenceStorage(newStorage);
                 setSlice(list, slice, pvalue, wrongLength);
             }
@@ -493,7 +496,7 @@ public PNone doPListTupleValue(PList list, PSlice slice, PSequence value,
         public PNone doPListEmpty(PList list, PSlice slice, PSequence value,
                         @Cached("createBinaryProfile()") ConditionProfile wrongLength) {
             if (value.len() > 0) {
-                SequenceStorage newStorage = list.getSequenceStorage().generalizeFor(value.getSequenceStorage().getIndicativeValue(), value.getSequenceStorage());
+                SequenceStorage newStorage = getGenNode().execute(list.getSequenceStorage(), value.getSequenceStorage().getIndicativeValue());
                 list.setSequenceStorage(newStorage);
                 setSlice(list, slice, value, wrongLength);
             }
@@ -511,7 +514,7 @@ public PNone doPListInt(PList list, PSlice slice, PSequence value,
         @Specialization(guards = {"!areTheSameType(list, value)"})
         public PNone doPList(PList list, PSlice slice, PSequence value,
                         @Cached("createBinaryProfile()") ConditionProfile wrongLength) {
-            SequenceStorage newStorage = list.getSequenceStorage().generalizeFor(value.getSequenceStorage().getIndicativeValue(), value.getSequenceStorage());
+            SequenceStorage newStorage = getGenNode().execute(list.getSequenceStorage(), value.getSequenceStorage().getIndicativeValue());
             list.setSequenceStorage(newStorage);
             setSlice(list, slice, value, wrongLength);
             return PNone.NONE;
@@ -542,7 +545,7 @@ private void canGeneralize(PList list, PSlice slice, PSequence value, ConditionP
             try {
                 setSlice(list, slice, value, wrongLength);
             } catch (SequenceStoreException e) {
-                SequenceStorage newStorage = list.getSequenceStorage().generalizeFor(value.getSequenceStorage().getIndicativeValue(), value.getSequenceStorage());
+                SequenceStorage newStorage = getGenNode().execute(list.getSequenceStorage(), value.getSequenceStorage().getIndicativeValue());
                 list.setSequenceStorage(newStorage);
                 try {
                     setSlice(list, slice, value, wrongLength);
@@ -552,6 +555,14 @@ private void canGeneralize(PList list, PSlice slice, PSequence value, ConditionP
             }
         }
 
+        private ListGeneralizationNode getGenNode() {
+            if (genNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                genNode = insert(ListGeneralizationNode.create());
+            }
+            return genNode;
+        }
+
         private void setSlice(PSequence list, PSlice slice, PSequence value, ConditionProfile wrongLength) {
             SequenceStorage store = list.getSequenceStorage();
             PSlice.SliceInfo sinfo = slice.computeActualIndices(store.length());