fix specialization guard for bytearray.translate, remove dead code

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_bytes.py

@@ -688,8 +688,8 @@ def test_translate_no_change(self):
 
 class ByteArrayTest(BaseLikeBytes, unittest.TestCase):
     type2test = bytearray
-    
-    def test_translate_no_change(self):
+
+    def test_translate_no_change2(self):
         b = bytearray(b'ahoj')
         self.assertIsNot(b, b.translate(None))
         self.assertIsNot(b, b.translate(None, b''))

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

@@ -932,7 +932,7 @@ public PByteArray translate(PByteArray self, @SuppressWarnings("unused") PNone t
             return factory().createByteArray(self.getSequenceStorage().copy());
         }
 
-        @Specialization
+        @Specialization(guards = "!isNone(table)")
         public PBytes translate(PBytes self, Object table, @SuppressWarnings("unused") PNone delete) {
             byte[] bTable = getToBytesNode().execute(table);
             checkLengthOfTable(bTable);
@@ -945,7 +945,7 @@ public PBytes translate(PBytes self, Object table, @SuppressWarnings("unused") P
             return self;
         }
 
-        @Specialization
+        @Specialization(guards = "!isNone(table)")
         public PByteArray translate(PByteArray self, Object table, @SuppressWarnings("unused") PNone delete) {
             byte[] bTable = getToBytesNode().execute(table);
             checkLengthOfTable(bTable);

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

@@ -633,55 +633,6 @@ private int getLength(SequenceStorage s) {
         }
     }
 
-    @Builtin(name = "translate", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 3)
-    @GenerateNodeFactory
-    abstract static class TranslateNode extends PythonBuiltinNode {
-
-        @Child private SequenceStorageNodes.GetItemNode getSelfItemNode;
-        @Child private SequenceStorageNodes.GetItemNode getTableItemNode;
-
-        @Specialization
-        PByteArray translate(PByteArray self, PBytes table, @SuppressWarnings("unused") PNone delete) {
-            return translate(self.getSequenceStorage(), table.getSequenceStorage());
-        }
-
-        @Specialization
-        PByteArray translate(PByteArray self, PByteArray table, @SuppressWarnings("unused") PNone delete) {
-            return translate(self.getSequenceStorage(), table.getSequenceStorage());
-        }
-
-        private PByteArray translate(SequenceStorage selfStorage, SequenceStorage tableStorage) {
-            if (tableStorage.length() != 256) {
-                throw raise(ValueError, "translation table must be 256 characters long");
-            }
-            byte[] result = new byte[selfStorage.length()];
-            for (int i = 0; i < selfStorage.length(); i++) {
-                int b = getGetSelfItemNode().executeInt(selfStorage, i);
-                int t = getGetTableItemNode().executeInt(tableStorage, b);
-                assert t >= 0 && t < 256;
-                result[i] = (byte) t;
-            }
-            return factory().createByteArray(result);
-        }
-
-        private SequenceStorageNodes.GetItemNode getGetSelfItemNode() {
-            if (getSelfItemNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                getSelfItemNode = insert(SequenceStorageNodes.GetItemNode.create());
-            }
-            return getSelfItemNode;
-        }
-
-        private SequenceStorageNodes.GetItemNode getGetTableItemNode() {
-            if (getTableItemNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                getTableItemNode = insert(SequenceStorageNodes.GetItemNode.create());
-            }
-            return getTableItemNode;
-        }
-
-    }
-
     @Builtin(name = __GETITEM__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     abstract static class GetitemNode extends PythonBinaryBuiltinNode {