replace new byte[0] with PythonUtils.EMPTY_BYTES_ARRAY

cosminbasca · cosminbasca · commit 70e1edda9538 · 2020-09-21T22:23:20.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ArrayModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ArrayModuleBuiltins.java
@@ -49,6 +49,7 @@
 import com.oracle.graal.python.nodes.util.CastToByteNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.PSequence;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -274,13 +275,12 @@ private PArray makeEmptyArray(Object cls, char type) {
             switch (type) {
                 case 'c':
                 case 'b':
-                    return factory().createArray(cls, new byte[0]);
                 case 'B':
-                    return factory().createArray(cls, new byte[0]);
+                    return factory().createArray(cls, PythonUtils.EMPTY_BYTE_ARRAY);
                 case 'i':
-                    return factory().createArray(cls, new int[0]);
+                    return factory().createArray(cls, PythonUtils.EMPTY_INT_ARRAY);
                 case 'd':
-                    return factory().createArray(cls, new double[0]);
+                    return factory().createArray(cls, PythonUtils.EMPTY_DOUBLE_ARRAY);
                 default:
                     return null;
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -276,7 +276,7 @@ public abstract static class ByteArrayNode extends PythonBuiltinNode {
         @Specialization
         public Object createByteArray(Object cls, @SuppressWarnings("unused") Object source, @SuppressWarnings("unused") Object encoding, @SuppressWarnings("unused") Object errors) {
             // data filled in subsequent __init__ call - see BytesBuiltins.InitNode
-            return factory().createByteArray(cls, new byte[0]);
+            return factory().createByteArray(cls, PythonUtils.EMPTY_BYTE_ARRAY);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java
@@ -81,6 +81,7 @@
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
 import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -612,7 +613,7 @@ private byte[] readBytes() {
                 index += len;
                 return bytes;
             } else {
-                return new byte[0];
+                return PythonUtils.EMPTY_BYTE_ARRAY;
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java
@@ -1648,7 +1648,7 @@ protected List<byte[]> splitDelimiter(byte[] bytes, byte[] sep, int maxsplit) {
                 if (begin < offset) {
                     result.add(copyOfRange(bytes, begin, offset));
                 } else {
-                    result.add(new byte[0]);
+                    result.add(PythonUtils.EMPTY_BYTE_ARRAY);
                 }
                 begin = offset + sep.length;
                 offset = begin - 1;
@@ -1756,7 +1756,7 @@ protected List<byte[]> splitDelimiter(byte[] bytes, byte[] sep, int maxsplit) {
                 if (end > offset) {
                     result.add(0, copyOfRange(bytes, offset + 1, end));
                 } else {
-                    result.add(0, new byte[0]);
+                    result.add(0, PythonUtils.EMPTY_BYTE_ARRAY);
                 }
                 end = offset;
                 if (--countSplit == 0) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesNodes.java
@@ -541,7 +541,7 @@ public abstract static class ConvertToByteObjectBytesNode extends Node {
 
         @Specialization(guards = {"isNoValue(source)", "isNoValue(encoding)", "isNoValue(errors)"})
         byte[] bytearray(@SuppressWarnings("unused") PNone source, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors) {
-            return new byte[0];
+            return PythonUtils.EMPTY_BYTE_ARRAY;
         }
 
         @Specialization(guards = {"lib.canBeIndex(capObj)", "isNoValue(encoding)", "isNoValue(errors)"})
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapper.java
@@ -66,6 +66,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.EmptySequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -447,7 +448,7 @@ NativeSequenceStorage doNative(NativeSequenceStorage s) {
         NativeSequenceStorage doEmptyStorage(@SuppressWarnings("unused") EmptySequenceStorage s,
                         @Shared("storageToNativeNode") @Cached SequenceStorageNodes.StorageToNativeNode storageToNativeNode) {
             // TODO(fa): not sure if that completely reflects semantics
-            return storageToNativeNode.execute(new byte[0]);
+            return storageToNativeNode.execute(PythonUtils.EMPTY_BYTE_ARRAY);
         }
 
         protected static boolean isNative(SequenceStorage s) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeBuiltins.java
@@ -40,6 +40,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -202,7 +203,7 @@ protected Object get(PCode self) {
             byte[] lnotab = self.getLnotab();
             if (lnotab == null) {
                 // TODO: this is for the moment undefined (see co_code)
-                lnotab = new byte[0];
+                lnotab = PythonUtils.EMPTY_BYTE_ARRAY;
             }
             return factory().createBytes(lnotab);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java
@@ -353,7 +353,7 @@ private static byte[] extractCodeString(RootNode rootNode) {
             return serializer.serialize(rootNode);
         }
         // no code for non-user functions
-        return new byte[0];
+        return PythonUtils.EMPTY_BYTE_ARRAY;
     }
 
     public RootNode getRootNode() {
@@ -537,15 +537,15 @@ public String toString() {
     private static PTuple createTuple(Object[] array, PythonObjectFactory factory) {
         Object[] data = array;
         if (data == null) {
-            data = new Object[0];
+            data = PythonUtils.EMPTY_OBJECT_ARRAY;
         }
         return factory.createTuple(data);
     }
 
     private static PBytes createBytes(byte[] array, PythonObjectFactory factory) {
         byte[] bytes = array;
         if (bytes == null) {
-            bytes = new byte[0];
+            bytes = PythonUtils.EMPTY_BYTE_ARRAY;
         }
         return factory.createBytes(bytes);
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java
@@ -182,10 +182,10 @@ PCode get(VirtualFrame frame, PFrame self,
             }
             // TODO: frames: this just shouldn't happen anymore
             assert false : "should not be reached";
-            return createCodeNode.execute(frame, PythonBuiltinClassType.PCode, -1, -1, -1, -1, -1, -1, new byte[0], PythonUtils.EMPTY_OBJECT_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY,
+            return createCodeNode.execute(frame, PythonBuiltinClassType.PCode, -1, -1, -1, -1, -1, -1, PythonUtils.EMPTY_BYTE_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY,
                             PythonUtils.EMPTY_OBJECT_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY,
                             "<internal>",
-                            "<internal>", -1, new byte[0]);
+                            "<internal>", -1, PythonUtils.EMPTY_BYTE_ARRAY);
         }
 
         public static GetCodeNode create() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/lzma/LZMADecompressorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/lzma/LZMADecompressorBuiltins.java
@@ -65,6 +65,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.util.CastToByteNode;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -184,7 +185,7 @@ abstract static class UnusedDataNode extends PythonUnaryBuiltinNode {
         @Specialization
         PBytes doUnusedData(@SuppressWarnings("unused") PLZMADecompressor self) {
             // TODO implement
-            return factory().createBytes(new byte[0]);
+            return factory().createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
         }
 
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorAccessNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorAccessNode.java
@@ -46,8 +46,8 @@ final class GeneratorAccessNode extends Node {
     private static final byte TRUE = 1;
     private static final byte FALSE = 2;
 
-    @CompilationFinal(dimensions = 1) private byte[] active = new byte[0];
-    @CompilationFinal(dimensions = 1) private int[] indices = new int[0];
+    @CompilationFinal(dimensions = 1) private byte[] active = PythonUtils.EMPTY_BYTE_ARRAY;
+    @CompilationFinal(dimensions = 1) private int[] indices = PythonUtils.EMPTY_INT_ARRAY;
 
     private GeneratorAccessNode() {
         // private constructor
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/ChannelNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/ChannelNodes.java
@@ -59,6 +59,7 @@
 import com.oracle.graal.python.nodes.util.ChannelNodesFactory.WriteToChannelNodeGen;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -183,7 +184,7 @@ static ByteSequenceStorage readReadable(Object channel, int size,
             int readSize = readIntoBuffer(channel, dst, gotException, raiseNode);
             byte[] array;
             if (readSize <= 0) {
-                array = new byte[0];
+                array = PythonUtils.EMPTY_BYTE_ARRAY;
                 readSize = 0;
             } else {
                 array = getByteBufferArray(dst);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java
@@ -66,6 +66,9 @@ private PythonUtils() {
 
     public static final String[] EMPTY_STRING_ARRAY = new String[0];
     public static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
+    public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+    public static final int[] EMPTY_INT_ARRAY = new int[0];
+    public static final double[] EMPTY_DOUBLE_ARRAY = new double[0];
 
     /**
      * Executes System.arraycopy and puts all exceptions on the slow path.

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public abstract static class ByteArrayNode extends PythonBuiltinNode {`
`276`	`276`	`@Specialization`
`277`	`277`	`public Object createByteArray(Object cls, @SuppressWarnings("unused") Object source, @SuppressWarnings("unused") Object encoding, @SuppressWarnings("unused") Object errors) {`
`278`	`278`	`// data filled in subsequent __init__ call - see BytesBuiltins.InitNode`
`279`		`- return factory().createByteArray(cls, new byte[0]);`
	`279`	`+ return factory().createByteArray(cls, PythonUtils.EMPTY_BYTE_ARRAY);`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`
Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ public abstract static class ConvertToByteObjectBytesNode extends Node {`
`541`	`541`
`542`	`542`	`@Specialization(guards = {"isNoValue(source)", "isNoValue(encoding)", "isNoValue(errors)"})`
`543`	`543`	`byte[] bytearray(@SuppressWarnings("unused") PNone source, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors) {`
`544`		`- return new byte[0];`
	`544`	`+ return PythonUtils.EMPTY_BYTE_ARRAY;`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`@Specialization(guards = {"lib.canBeIndex(capObj)", "isNoValue(encoding)", "isNoValue(errors)"})`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ private static byte[] extractCodeString(RootNode rootNode) {`
`353`	`353`	`return serializer.serialize(rootNode);`
`354`	`354`	`}`
`355`	`355`	`// no code for non-user functions`
`356`		`- return new byte[0];`
	`356`	`+ return PythonUtils.EMPTY_BYTE_ARRAY;`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`public RootNode getRootNode() {`
`@@ -537,15 +537,15 @@ public String toString() {`
`537`	`537`	`private static PTuple createTuple(Object[] array, PythonObjectFactory factory) {`
`538`	`538`	`Object[] data = array;`
`539`	`539`	`if (data == null) {`
`540`		`- data = new Object[0];`
	`540`	`+ data = PythonUtils.EMPTY_OBJECT_ARRAY;`
`541`	`541`	`}`
`542`	`542`	`return factory.createTuple(data);`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`private static PBytes createBytes(byte[] array, PythonObjectFactory factory) {`
`546`	`546`	`byte[] bytes = array;`
`547`	`547`	`if (bytes == null) {`
`548`		`- bytes = new byte[0];`
	`548`	`+ bytes = PythonUtils.EMPTY_BYTE_ARRAY;`
`549`	`549`	`}`
`550`	`550`	`return factory.createBytes(bytes);`
`551`	`551`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,10 +182,10 @@ PCode get(VirtualFrame frame, PFrame self,`
`182`	`182`	`}`
`183`	`183`	`// TODO: frames: this just shouldn't happen anymore`
`184`	`184`	`assert false : "should not be reached";`
`185`		`- return createCodeNode.execute(frame, PythonBuiltinClassType.PCode, -1, -1, -1, -1, -1, -1, new byte[0], PythonUtils.EMPTY_OBJECT_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY,`
	`185`	`+ return createCodeNode.execute(frame, PythonBuiltinClassType.PCode, -1, -1, -1, -1, -1, -1, PythonUtils.EMPTY_BYTE_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY,`
`186`	`186`	`PythonUtils.EMPTY_OBJECT_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY, PythonUtils.EMPTY_OBJECT_ARRAY,`
`187`	`187`	`"<internal>",`
`188`		`- "<internal>", -1, new byte[0]);`
	`188`	`+ "<internal>", -1, PythonUtils.EMPTY_BYTE_ARRAY);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`public static GetCodeNode create() {`