Remove obsolete method 'PSequence.delItem'.

fangerer · fangerer · commit 24a0f75a1ab6 · 2018-08-14T09:40:01.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PArray.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PArray.java
@@ -54,11 +54,6 @@ public void setSlice(PSlice slice, PSequence value) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void delItem(int idx) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public SequenceStorage getSequenceStorage() {
         return store;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java
@@ -57,10 +57,6 @@ public PByteArray(PythonClass cls, SequenceStorage store) {
         this.store = store;
     }
 
-    public void setItem(int idx, Object value) {
-        setItemNormalized(SequenceUtil.normalizeIndex(idx, store.length(), "array index out of range"), value);
-    }
-
     public void setItemNormalized(int index, Object value) {
         try {
             store.setItemNormalized(index, value);
@@ -98,12 +94,6 @@ public void setSlice(PSlice slice, PSequence value) {
         setSlice(sliceInfo.start, sliceInfo.stop, sliceInfo.step, value);
     }
 
-    @Override
-    public void delItem(int idx) {
-        int index = SequenceUtil.normalizeIndex(idx, store.length(), "array index out of range");
-        store.delItemInBound(index);
-    }
-
     @Override
     public SequenceStorage getSequenceStorage() {
         return store;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -245,23 +245,22 @@ private CastToIndexNode getCastToIndexNode() {
         private int normalizeIndex(Object idx, int length) {
             int intIdx = getCastToIndexNode().execute(idx);
             if (normalizeIndexNode != null) {
-                return normalizeIndexNode.execute(intIdx, length);
+                return normalizeIndexNode.doInt(intIdx, length);
             }
             return intIdx;
         }
 
         private int normalizeIndex(int idx, int length) {
-            int intIdx = getCastToIndexNode().execute(idx);
             if (normalizeIndexNode != null) {
-                return normalizeIndexNode.execute(intIdx, length);
+                return normalizeIndexNode.doInt(idx, length);
             }
-            return intIdx;
+            return idx;
         }
 
         private int normalizeIndex(long idx, int length) {
             int intIdx = getCastToIndexNode().execute(idx);
             if (normalizeIndexNode != null) {
-                return normalizeIndexNode.execute(intIdx, length);
+                return normalizeIndexNode.doInt(intIdx, length);
             }
             return intIdx;
         }
@@ -1304,7 +1303,7 @@ public NormalizeIndexNode(String errorMessage, boolean boundsCheck) {
         public abstract int execute(Object index, int length);
 
         @Specialization
-        int doInt(int index, int length) {
+        public int doInt(int index, int length) {
             int idx = index;
             if (negativeIndexProfile.profile(idx < 0)) {
                 idx += length;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java
@@ -98,6 +98,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.SetSequenceStorageItem;
 import com.oracle.graal.python.runtime.sequence.storage.TupleSequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -672,7 +673,7 @@ public PNone remove(PList list, Object value,
             for (int i = 0; i < len; i++) {
                 Object object = getItemNode.execute(listStore, i);
                 if (eqNode.executeBool(object, value)) {
-                    list.delItem(i);
+                    listStore.delItemInBound(i);
                     return PNone.NONE;
                 }
             }
@@ -692,6 +693,8 @@ public abstract static class ListPopNode extends PythonBuiltinNode {
 
         @Child private SequenceStorageNodes.GetItemNode getItemNode;
 
+        @CompilationFinal private ValueProfile storeProfile;
+
         @Specialization(guards = "isIntStorage(list)")
         public int popInt(PList list, @SuppressWarnings("unused") PNone none,
                         @Cached("createBinaryProfile()") ConditionProfile isEmpty) {
@@ -725,25 +728,25 @@ public Object popObject(PList list, @SuppressWarnings("unused") PNone none,
         }
 
         @Specialization
-        public Object popLast(PList list, @SuppressWarnings("unused") PNone none,
-                        @Cached("createBinaryProfile()") ConditionProfile isEmpty) {
-            raiseIndexError(isEmpty.profile(list.len() == 0));
-            Object ret = getGetItemNode().execute(list.getSequenceStorage(), -1);
-            list.delItem(list.len() - 1);
+        public Object popLast(PList list, @SuppressWarnings("unused") PNone none) {
+            SequenceStorage store = getStoreProfile().profile(list.getSequenceStorage());
+            int len = store.length();
+            Object ret = getGetItemNode().execute(store, -1);
+            store.delItemInBound(len - 1);
             return ret;
         }
 
         @Specialization
         public Object pop(PList list, boolean bindex,
                         @Cached("createBinaryProfile()") ConditionProfile isOutOfRange) {
             int index = bindex ? 1 : 0;
-            return popOnIndex(list, index, isOutOfRange);
+            return popOnIndex(list.getSequenceStorage(), index, isOutOfRange);
         }
 
         @Specialization
         public Object pop(PList list, int index,
                         @Cached("createBinaryProfile()") ConditionProfile isOutOfRange) {
-            return popOnIndex(list, index, isOutOfRange);
+            return popOnIndex(list.getSequenceStorage(), index, isOutOfRange);
         }
 
         @Specialization
@@ -765,20 +768,31 @@ protected void raiseIndexError(boolean con) {
             }
         }
 
-        private Object popOnIndex(PList list, int index, ConditionProfile cp) {
-            int len = list.len();
+        private Object popOnIndex(SequenceStorage store, int index, ConditionProfile cp) {
+
+            SequenceStorage profiled = getStoreProfile().profile(store);
+            int len = profiled.length();
             if (cp.profile((index < 0 && (index + len) < 0) || index >= len)) {
                 throw raise(PythonErrorType.IndexError, "pop index out of range");
             }
-            Object ret = getGetItemNode().execute(list.getSequenceStorage(), index);
-            list.delItem(index);
+            Object ret = getGetItemNode().execute(profiled, index);
+            // this is safe because index is already verified by 'GetItemNode'
+            profiled.delItemInBound(index);
             return ret;
         }
 
+        private ValueProfile getStoreProfile() {
+            if (storeProfile == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                storeProfile = ValueProfile.createClassProfile();
+            }
+            return storeProfile;
+        }
+
         private SequenceStorageNodes.GetItemNode getGetItemNode() {
             if (getItemNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                getItemNode = insert(SequenceStorageNodes.GetItemNode.create());
+                getItemNode = insert(SequenceStorageNodes.GetItemNode.create(NormalizeIndexNode.create("pop index out of range")));
             }
             return getItemNode;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java
@@ -28,7 +28,6 @@
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.sequence.PSequence;
-import com.oracle.graal.python.runtime.sequence.SequenceUtil;
 import com.oracle.graal.python.runtime.sequence.storage.EmptySequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStoreException;
@@ -57,7 +56,7 @@ public final void setSequenceStorage(SequenceStorage newStorage) {
     @Override
     public final void setSlice(PSlice slice, PSequence value) {
         // Should not be used. Replaces with ListNodes.SetSliceNode.
-        // When it will be replaced in other PSequence implementeations,
+        // When it will be replaced in other PSequence implementations,
         // then the setSlice from PSequence can be removed.
         throw new UnsupportedOperationException();
     }
@@ -67,12 +66,6 @@ public final void setSlice(int start, int stop, int step, PSequence value) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public final void delItem(int idx) {
-        int index = SequenceUtil.normalizeIndex(idx, store.length(), "list index out of range");
-        store.delItemInBound(index);
-    }
-
     public final void delSlice(PSlice slice) {
         PSlice.SliceInfo sliceInfo = slice.computeActualIndices(this.len());
         store.delSlice(sliceInfo.start, sliceInfo.stop, sliceInfo.step);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PImmutableSequence.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PImmutableSequence.java
@@ -58,10 +58,4 @@ public final void setSlice(PSlice slice, PSequence value) {
     public final void setSlice(int start, int stop, int step, PSequence value) {
         throw new UnsupportedOperationException();
     }
-
-    @Override
-    public final void delItem(int idx) {
-        throw new UnsupportedOperationException();
-    }
-
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PSequence.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PSequence.java
@@ -42,8 +42,6 @@ public PSequence(PythonClass cls) {
 
     public abstract void setSlice(PSlice slice, PSequence value);
 
-    public abstract void delItem(int idx);
-
     public abstract SequenceStorage getSequenceStorage();
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -245,23 +245,22 @@ private CastToIndexNode getCastToIndexNode() {`
`245`	`245`	`private int normalizeIndex(Object idx, int length) {`
`246`	`246`	`int intIdx = getCastToIndexNode().execute(idx);`
`247`	`247`	`if (normalizeIndexNode != null) {`
`248`		`- return normalizeIndexNode.execute(intIdx, length);`
	`248`	`+ return normalizeIndexNode.doInt(intIdx, length);`
`249`	`249`	`}`
`250`	`250`	`return intIdx;`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`private int normalizeIndex(int idx, int length) {`
`254`		`- int intIdx = getCastToIndexNode().execute(idx);`
`255`	`254`	`if (normalizeIndexNode != null) {`
`256`		`- return normalizeIndexNode.execute(intIdx, length);`
	`255`	`+ return normalizeIndexNode.doInt(idx, length);`
`257`	`256`	`}`
`258`		`- return intIdx;`
	`257`	`+ return idx;`
`259`	`258`	`}`
`260`	`259`
`261`	`260`	`private int normalizeIndex(long idx, int length) {`
`262`	`261`	`int intIdx = getCastToIndexNode().execute(idx);`
`263`	`262`	`if (normalizeIndexNode != null) {`
`264`		`- return normalizeIndexNode.execute(intIdx, length);`
	`263`	`+ return normalizeIndexNode.doInt(intIdx, length);`
`265`	`264`	`}`
`266`	`265`	`return intIdx;`
`267`	`266`	`}`
`@@ -1304,7 +1303,7 @@ public NormalizeIndexNode(String errorMessage, boolean boundsCheck) {`
`1304`	`1303`	`public abstract int execute(Object index, int length);`
`1305`	`1304`
`1306`	`1305`	`@Specialization`
`1307`		`- int doInt(int index, int length) {`
	`1306`	`+ public int doInt(int index, int length) {`
`1308`	`1307`	`int idx = index;`
`1309`	`1308`	`if (negativeIndexProfile.profile(idx < 0)) {`
`1310`	`1309`	`idx += length;`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,4 @@ public final void setSlice(PSlice slice, PSequence value) {`
`58`	`58`	`public final void setSlice(int start, int stop, int step, PSequence value) {`
`59`	`59`	`throw new UnsupportedOperationException();`
`60`	`60`	`}`
`61`		`-`
`62`		`- @Override`
`63`		`- public final void delItem(int idx) {`
`64`		`- throw new UnsupportedOperationException();`
`65`		`- }`
`66`		`-`
`67`	`61`	`}`