Remove obsolete method 'SequenceStorage.count'.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

@@ -68,6 +68,7 @@
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.control.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
+import com.oracle.graal.python.nodes.expression.BinaryComparisonNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
@@ -91,6 +92,7 @@
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.api.profiles.ValueProfile;
 
 @CoreFunctions(extendClasses = PythonBuiltinClassType.PByteArray)
 public class ByteArrayBuiltins extends PythonBuiltins {
@@ -456,11 +458,23 @@ public int index(PByteArray byteArray, Object arg,
     // bytearray.count(x)
     @Builtin(name = "count", fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class ByteArrayCountNode extends PythonBuiltinNode {
+    @ImportStatic(SpecialMethodNames.class)
+    public abstract static class ByteArrayCountNode extends PythonBinaryBuiltinNode {
 
         @Specialization
-        public int count(PByteArray byteArray, Object arg) {
-            return byteArray.count(arg);
+        public int count(PByteArray byteArray, Object arg,
+                        @Cached("createClassProfile()") ValueProfile storeProfile,
+                        @Cached("createNotNormalized()") SequenceStorageNodes.GetItemNode getItemNode,
+                        @Cached("create(__EQ__, __EQ__, __EQ__)") BinaryComparisonNode eqNode) {
+
+            SequenceStorage profiled = storeProfile.profile(byteArray.getSequenceStorage());
+            int cnt = 0;
+            for (int i = 0; i < profiled.length(); i++) {
+                if (eqNode.executeBool(arg, getItemNode.execute(profiled, i))) {
+                    cnt++;
+                }
+            }
+            return cnt;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java

@@ -128,10 +128,6 @@ public final void delSlice(PSlice slice) {
         store.delSlice(start, stop, step);
     }
 
-    public int count(Object arg) {
-        return this.store.count(arg);
-    }
-
     @Override
     public PIBytesLike createFromBytes(PythonObjectFactory factory, byte[] bytes) {
         return factory.createByteArray(bytes);

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

@@ -171,10 +171,6 @@ public final int hashCode() {
         return super.hashCode();
     }
 
-    public int count(Object arg) {
-        return store.count(arg);
-    }
-
     public static PList require(Object value) {
         if (value instanceof PList) {
             return (PList) value;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java

@@ -101,14 +101,4 @@ public enum ListStorageType {
     public void clear() {
         this.delSlice(0, length(), 1);
     }
-
-    public int count(Object arg) {
-        int count = 0;
-        for (Object obj : getInternalArray()) {
-            if (obj.equals(arg)) {
-                count++;
-            }
-        }
-        return count;
-    }
 }