Fix missing storage generalization in PList.writeArrayElement

Author: msimacek

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

@@ -67,14 +67,14 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.GetItemSliceNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.InsertItemNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.ListGeneralizationNodeGen;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.MemMoveNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.NoGeneralizationCustomMessageNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.NoGeneralizationNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.RepeatNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.SetItemDynamicNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.SetItemNodeGen;
-import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.ToByteArrayNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.StorageToNativeNodeGen;
-import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.MemMoveNodeGen;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.ToByteArrayNodeGen;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.iterator.IteratorBuiltins.NextHelperNode;
 import com.oracle.graal.python.builtins.objects.iterator.IteratorNodes.BuiltinIteratorLengthHint;
@@ -1076,6 +1076,34 @@ protected static void doNative(NativeSequenceStorage storage, int idx, Object va
         }
     }
 
+    @GenerateUncached
+    @GenerateInline
+    @GenerateCached(false)
+    public abstract static class SetItemScalarGeneralizingNode extends Node {
+        public abstract SequenceStorage execute(Node inliningTarget, SequenceStorage storage, int idx, Object value, GenNodeSupplier genNodeSupplier);
+
+        @Specialization
+        static SequenceStorage set(Node inliningTarget, SequenceStorage storage, int idx, Object value, GenNodeSupplier genNodeSupplier,
+                        @Cached InlinedBranchProfile generalizeProfile,
+                        @Cached SetItemScalarNode setItemScalarNode,
+                        @Cached DoGeneralizationNode doGeneralizationNode) {
+            try {
+                setItemScalarNode.execute(inliningTarget, storage, idx, value);
+                return storage;
+            } catch (SequenceStoreException e) {
+                generalizeProfile.enter(inliningTarget);
+                SequenceStorage generalized = doGeneralizationNode.execute(inliningTarget, genNodeSupplier, storage, e.getIndicationValue());
+                try {
+                    setItemScalarNode.execute(inliningTarget, generalized, idx, value);
+                } catch (SequenceStoreException e1) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    throw new IllegalStateException();
+                }
+                return generalized;
+            }
+        }
+    }
+
     @GenerateUncached
     @GenerateInline
     @GenerateCached(false)

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

@@ -50,6 +50,7 @@
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.Shape;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
 @SuppressWarnings("truffle-abstract-export")
@@ -115,7 +116,7 @@ public boolean hasSourceLocation() {
 
     @ExportMessage
     public boolean isArrayElementModifiable(long index,
-                    @Cached.Exclusive @Cached IndexNodes.NormalizeIndexCustomMessageNode normalize,
+                    @Exclusive @Cached IndexNodes.NormalizeIndexCustomMessageNode normalize,
                     @Exclusive @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
@@ -145,7 +146,7 @@ public boolean isArrayElementInsertable(long index,
 
     @ExportMessage
     public boolean isArrayElementRemovable(long index,
-                    @Cached.Exclusive @Cached IndexNodes.NormalizeIndexCustomMessageNode normalize,
+                    @Exclusive @Cached IndexNodes.NormalizeIndexCustomMessageNode normalize,
                     @Exclusive @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
@@ -165,17 +166,24 @@ public boolean isArrayElementRemovable(long index,
     public void writeArrayElement(long index, Object value,
                     @Bind("$node") Node inliningTarget,
                     @Cached PForeignToPTypeNode convert,
-                    @Cached.Exclusive @Cached SequenceStorageNodes.SetItemScalarNode setItem,
+                    @Exclusive @Cached SequenceStorageNodes.SetItemScalarGeneralizingNode setItem,
                     @Cached SequenceStorageNodes.AppendNode appendNode,
+                    @Cached InlinedBranchProfile generalizedProfile,
                     @Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
         boolean mustRelease = gil.acquire();
         try {
             final int len = store.length();
+            value = convert.executeConvert(value);
             try {
+                SequenceStorage newStorage;
                 if (index == len) {
-                    appendNode.execute(inliningTarget, store, convert.executeConvert(value), SequenceStorageNodes.ListGeneralizationNode.SUPPLIER);
+                    newStorage = appendNode.execute(inliningTarget, store, value, SequenceStorageNodes.ListGeneralizationNode.SUPPLIER);
                 } else {
-                    setItem.execute(inliningTarget, store, PInt.intValueExact(index), convert.executeConvert(value));
+                    newStorage = setItem.execute(inliningTarget, store, PInt.intValueExact(index), value, SequenceStorageNodes.ListGeneralizationNode.SUPPLIER);
+                }
+                if (newStorage != store) {
+                    generalizedProfile.enter(inliningTarget);
+                    store = newStorage;
                 }
             } catch (OverflowException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();