Extract common method for creating empty bytes objects

msimacek · msimacek · commit e2cb219b9eaf · 2024-04-16T14:53:37.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/MultibyteCodecUtil.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/MultibyteCodecUtil.java
@@ -66,7 +66,6 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.UnicodeDecodeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.UnicodeEncodeError;
-import static com.oracle.graal.python.util.PythonUtils.EMPTY_BYTE_ARRAY;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 
@@ -427,7 +426,7 @@ static void decerror(VirtualFrame frame, MultibyteCodec codec,
     protected static PBytes encodeEmptyInput(int len, int flags,
                     PythonObjectFactory factory) {
         if (len == 0 && (flags & MBENC_RESET) == 0) {
-            return factory.createBytes(EMPTY_BYTE_ARRAY);
+            return factory.createEmptyBytes();
         }
         return null;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCArrayBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCArrayBuiltins.java
@@ -273,7 +273,7 @@ static Object Array_subscript(CDataObject self, PSlice slice,
                 byte[] ptr = bufferLib.getInternalOrCopiedByteArray(self);
 
                 if (slicelen <= 0) {
-                    return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+                    return factory.createEmptyBytes();
                 }
                 if (sliceInfo.step == 1) {
                     return factory.createBytes(ptr, sliceInfo.start, slicelen);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCPointerBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCPointerBuiltins.java
@@ -90,7 +90,6 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
-import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -355,7 +354,7 @@ static Object Pointer_subscriptSlice(VirtualFrame frame, CDataObject self, PSlic
                 byte[] ptr = bufferLib.getInternalOrCopiedByteArray(self);
 
                 if (len <= 0) {
-                    return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+                    return factory.createEmptyBytes();
                 }
                 if (step == 1) {
                     return factory.createBytes(ptr, start, len);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedReaderMixinBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedReaderMixinBuiltins.java
@@ -252,7 +252,7 @@ public static boolean isReadFast(PBuffered self, int size) {
         Object empty(VirtualFrame frame, PBuffered self, @SuppressWarnings("unused") int size,
                         @Shared @Cached PythonObjectFactory factory) {
             checkIsClosedNode.execute(frame, self);
-            return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+            return factory.createEmptyBytes();
         }
 
         /*
@@ -501,7 +501,7 @@ static PBytes doit(VirtualFrame frame, PBuffered self, int size,
             }
 
             if (n == 0) {
-                return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+                return factory.createEmptyBytes();
             }
             /*- Return up to n bytes.  If at least one byte is buffered, we
                only return buffered bytes.  Otherwise, we do one raw read. */
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BytesIOBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BytesIOBuiltins.java
@@ -205,7 +205,7 @@ static PBytes readBytes(PBytesIO self, int size,
                     PythonBufferAccessLibrary bufferLib,
                     PythonObjectFactory factory) {
         if (size == 0) {
-            return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+            return factory.createEmptyBytes();
         }
 
         assert (size <= self.getStringSize());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java
@@ -157,7 +157,6 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
-import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -518,7 +517,7 @@ static Object readall(VirtualFrame frame, PFileIO self, @SuppressWarnings("unuse
         @Specialization(guards = {"!self.isClosed()", "self.isReadable()", "size == 0"})
         static Object none(@SuppressWarnings("unused") PFileIO self, @SuppressWarnings("unused") int size,
                         @Shared @Cached PythonObjectFactory factory) {
-            return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+            return factory.createEmptyBytes();
         }
 
         @Specialization(guards = {"!self.isClosed()", "self.isReadable()", "size >= 0"})
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IncrementalNewlineDecoderBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IncrementalNewlineDecoderBuiltins.java
@@ -83,7 +83,6 @@
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
-import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -286,7 +285,7 @@ abstract static class GetStateNode extends PythonUnaryBuiltinNode {
         @Specialization(guards = "!self.hasDecoder()")
         static Object noDecoder(PNLDecoder self,
                         @Shared @Cached PythonObjectFactory factory) {
-            PBytes buffer = factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+            PBytes buffer = factory.createEmptyBytes();
             int flag = self.isPendingCR() ? 1 : 0;
             return factory.createTuple(new Object[]{buffer, flag});
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/RawIOBaseBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/RawIOBaseBuiltins.java
@@ -132,7 +132,7 @@ static Object read(VirtualFrame frame, Object self, int size,
             }
             int n = asSizeNode.executeExact(frame, inliningTarget, res, ValueError);
             if (n == 0) {
-                return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+                return factory.createEmptyBytes();
             }
             byte[] bytes = toBytes.execute(b);
             if (n < size) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperNodes.java
@@ -101,7 +101,6 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
-import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -659,7 +658,7 @@ static void atInit(VirtualFrame frame, Node inliningTarget, PTextIO self, @Suppr
         @Specialization(guards = {"self.hasDecoder()", "!isAtInit(cookie)"})
         static void decoderSetstate(VirtualFrame frame, Node inliningTarget, PTextIO self, PTextIO.CookieType cookie, PythonObjectFactory factory,
                         @Exclusive @Cached PyObjectCallMethodObjArgs callMethodSetState) {
-            PTuple tuple = factory.createTuple(new Object[]{factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY), cookie.decFlags});
+            PTuple tuple = factory.createTuple(new Object[]{factory.createEmptyBytes(), cookie.decFlags});
             callMethodSetState.execute(frame, inliningTarget, self.getDecoder(), T_SETSTATE, tuple);
 
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/pickle/PicklerNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/pickle/PicklerNodes.java
@@ -54,7 +54,6 @@
 import static com.oracle.graal.python.nodes.statement.AbstractImportNode.importModule;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.AttributeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
-import static com.oracle.graal.python.util.PythonUtils.EMPTY_BYTE_ARRAY;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
@@ -391,7 +390,7 @@ protected Object decode(VirtualFrame frame, Object value, TruffleString encoding
 
         protected Object escapeDecode(VirtualFrame frame, PythonObjectFactory factory, byte[] data, int offset, int len) {
             if (len == 0) {
-                return factory.createBytes(EMPTY_BYTE_ARRAY);
+                return factory.createEmptyBytes();
             }
             return escapeDecode(frame, PythonUtils.arrayCopyOfRange(data, offset, offset + len));
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZLibModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZLibModuleBuiltins.java
@@ -776,8 +776,8 @@ Object doJava(int wbits, byte[] zdict) {
             }
             PythonObjectFactory factory = PythonObjectFactory.getUncached();
             ZLibCompObject obj = factory.createJavaZLibCompObject(ZlibDecompress, inflater, wbits, zdict);
-            obj.setUnusedData(factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY));
-            obj.setUnconsumedTail(factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY));
+            obj.setUnusedData(factory.createEmptyBytes());
+            obj.setUnconsumedTail(factory.createEmptyBytes());
             return obj;
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZlibCompressBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZlibCompressBuiltins.java
@@ -238,7 +238,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
         @Specialization(guards = "mode == Z_NO_FLUSH")
         static PBytes empty(ZLibCompObject self, int mode,
                         @Shared @Cached PythonObjectFactory factory) {
-            return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+            return factory.createEmptyBytes();
         }
 
         @Specialization(guards = {"mode != Z_NO_FLUSH", "self.isInitialized()"})
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZlibDecompressBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZlibDecompressBuiltins.java
@@ -285,14 +285,14 @@ PBytes doit(VirtualFrame frame, ZLibCompObject.JavaZlibCompObject self, int leng
         static PBytes empty(ZLibCompObject.JavaZlibCompObject self, int length,
                         @Shared @Cached PythonObjectFactory factory) {
             self.setUninitialized();
-            return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+            return factory.createEmptyBytes();
         }
 
         @SuppressWarnings("unused")
         @Specialization(guards = {"length > 0", "self.isEof() || !self.isInitialized()"})
         static PBytes empty(ZLibCompObject.NativeZlibCompObject self, int length,
                         @Shared @Cached PythonObjectFactory factory) {
-            return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+            return factory.createEmptyBytes();
         }
 
         @SuppressWarnings("unused")
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZlibNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZlibNodes.java
@@ -611,7 +611,7 @@ private static void saveUnconsumedInput(ZLibCompObject.JavaZlibCompObject self,
             byte[] tail = PythonUtils.arrayCopyOfRange(data, length - unusedLen, length);
             if (self.isEof()) {
                 if (unconsumedTailLen > 0) {
-                    self.setUnconsumedTail(factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY));
+                    self.setUnconsumedTail(factory.createEmptyBytes());
                 }
                 if (unusedDataBytes.length > 0 && tail.length > 0) {
                     byte[] newUnusedData = new byte[unusedDataBytes.length + tail.length];
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java
@@ -2064,7 +2064,7 @@ static PBytes doGeneric(GraalHPyContext hpyContext, Object charPtr, long lsize,
                 throw raiseNode.raise(SystemError, ErrorMessages.NEGATIVE_SIZE_PASSED);
             }
             if (lsize == 0) {
-                return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+                return factory.createEmptyBytes();
             }
             byte[] bytes = readI8ArrayNode.execute(hpyContext, charPtr, 0, lsize);
             return factory.createBytes(bytes);
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
@@ -32,7 +32,6 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.J___HASH__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.J___REPR__;
 import static com.oracle.graal.python.nodes.StringLiterals.T_NONE;
-import static com.oracle.graal.python.util.PythonUtils.EMPTY_BYTE_ARRAY;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.graal.python.util.PythonUtils.objectArrayToTruffleStringArray;
 
@@ -282,7 +281,7 @@ abstract static class GetExceptionTableNode extends PythonUnaryBuiltinNode {
         static Object get(PCode self,
                         @Cached PythonObjectFactory factory) {
             // We store our exception table together with the bytecode, not in this field
-            return factory.createBytes(EMPTY_BYTE_ARRAY);
+            return factory.createEmptyBytes();
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mmap/MMapBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mmap/MMapBuiltins.java
@@ -116,7 +116,6 @@
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -144,14 +143,6 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
         return MMapBuiltinsFactory.getFactories();
     }
 
-    private static PBytes createEmptyBytes(PythonObjectFactory factory) {
-        if (CompilerDirectives.inInterpreter()) {
-            return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
-        } else {
-            return factory.createBytes(new byte[0]);
-        }
-    }
-
     private static byte[] readBytes(VirtualFrame frame, Node inliningTarget, PMMap self, PosixSupportLibrary posixLib, Object posixSupport, long pos, int len,
                     PConstructAndRaiseNode.Lazy constructAndRaiseNode) {
         try {
@@ -204,7 +195,7 @@ static Object doSlice(VirtualFrame frame, PMMap self, PSlice idx,
                 SliceInfo info = compute.execute(frame, sliceCast.execute(inliningTarget, idx), PInt.intValueExact(self.getLength()));
                 int len = sliceLenNode.len(inliningTarget, info);
                 if (emptyProfile.profile(inliningTarget, len == 0)) {
-                    return createEmptyBytes(factory);
+                    return factory.createEmptyBytes();
                 }
                 byte[] result = readBytes(frame, inliningTarget, self, posixSupportLib, PosixSupport.get(inliningTarget), info.start, len, constructAndRaiseNode);
                 return factory.createBytes(result);
@@ -425,7 +416,7 @@ static PBytes read(VirtualFrame frame, PMMap self, Object n,
                 }
             }
             if (emptyProfile.profile(inliningTarget, nread == 0)) {
-                return createEmptyBytes(factory);
+                return factory.createEmptyBytes();
             }
             try {
                 byte[] buffer = MMapBuiltins.readBytes(frame, inliningTarget, self, posixLib, PosixSupport.get(inliningTarget), self.getPos(), PythonUtils.toIntExact(nread), constructAndRaiseNode);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/socket/SocketBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/socket/SocketBuiltins.java
@@ -592,7 +592,7 @@ Object recv(VirtualFrame frame, PSocket socket, int recvlen, int flags,
             }
             checkSelectable(inliningTarget, raiseNode, socket);
             if (recvlen == 0) {
-                return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+                return factory.createEmptyBytes();
             }
 
             byte[] bytes;
@@ -607,7 +607,7 @@ Object recv(VirtualFrame frame, PSocket socket, int recvlen, int flags,
                                 (p, s) -> p.recv(s, socket.getFd(), bytes, 0, bytes.length, flags),
                                 false, false);
                 if (outlen == 0) {
-                    return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+                    return factory.createEmptyBytes();
                 }
                 // TODO maybe resize if much smaller?
                 return factory.createBytes(bytes, outlen);
@@ -655,7 +655,7 @@ Object recvFrom(VirtualFrame frame, PSocket socket, int recvlen, int flags,
                                 false, false);
                 PBytes resultBytes;
                 if (result.readBytes == 0) {
-                    resultBytes = factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+                    resultBytes = factory.createEmptyBytes();
                 } else {
                     // TODO maybe resize if much smaller?
                     resultBytes = factory.createBytes(bytes, result.readBytes);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java
@@ -243,6 +243,7 @@
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
 import com.oracle.truffle.api.RootCallTarget;
@@ -440,6 +441,14 @@ public final PString createString(Object cls, NativeCharSequence string) {
         return trace(new PString(cls, getShape(cls), string));
     }
 
+    public final PBytes createEmptyBytes() {
+        if (CompilerDirectives.inInterpreter()) {
+            return createBytes(PythonUtils.EMPTY_BYTE_ARRAY);
+        } else {
+            return createBytes(new byte[0]);
+        }
+    }
+
     public final PBytes createBytes(byte[] array) {
         return createBytes(array, array.length);
     }

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ static Object Array_subscript(CDataObject self, PSlice slice,`
`273`	`273`	`byte[] ptr = bufferLib.getInternalOrCopiedByteArray(self);`
`274`	`274`
`275`	`275`	`if (slicelen <= 0) {`
`276`		`- return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);`
	`276`	`+ return factory.createEmptyBytes();`
`277`	`277`	`}`
`278`	`278`	`if (sliceInfo.step == 1) {`
`279`	`279`	`return factory.createBytes(ptr, sliceInfo.start, slicelen);`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public static boolean isReadFast(PBuffered self, int size) {`
`252`	`252`	`Object empty(VirtualFrame frame, PBuffered self, @SuppressWarnings("unused") int size,`
`253`	`253`	`@Shared @Cached PythonObjectFactory factory) {`
`254`	`254`	`checkIsClosedNode.execute(frame, self);`
`255`		`- return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);`
	`255`	`+ return factory.createEmptyBytes();`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`/*`
`@@ -501,7 +501,7 @@ static PBytes doit(VirtualFrame frame, PBuffered self, int size,`
`501`	`501`	`}`
`502`	`502`
`503`	`503`	`if (n == 0) {`
`504`		`- return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);`
	`504`	`+ return factory.createEmptyBytes();`
`505`	`505`	`}`
`506`	`506`	`/*- Return up to n bytes. If at least one byte is buffered, we`
`507`	`507`	`only return buffered bytes. Otherwise, we do one raw read. */`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ static PBytes readBytes(PBytesIO self, int size,`
`205`	`205`	`PythonBufferAccessLibrary bufferLib,`
`206`	`206`	`PythonObjectFactory factory) {`
`207`	`207`	`if (size == 0) {`
`208`		`- return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);`
	`208`	`+ return factory.createEmptyBytes();`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`assert (size <= self.getStringSize());`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ static Object read(VirtualFrame frame, Object self, int size,`
`132`	`132`	`}`
`133`	`133`	`int n = asSizeNode.executeExact(frame, inliningTarget, res, ValueError);`
`134`	`134`	`if (n == 0) {`
`135`		`- return factory.createBytes(PythonUtils.EMPTY_BYTE_ARRAY);`
	`135`	`+ return factory.createEmptyBytes();`
`136`	`136`	`}`
`137`	`137`	`byte[] bytes = toBytes.execute(b);`
`138`	`138`	`if (n < size) {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@`
`54`	`54`	`import static com.oracle.graal.python.nodes.statement.AbstractImportNode.importModule;`
`55`	`55`	`import static com.oracle.graal.python.runtime.exception.PythonErrorType.AttributeError;`
`56`	`56`	`import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;`
`57`		`-import static com.oracle.graal.python.util.PythonUtils.EMPTY_BYTE_ARRAY;`
`58`	`57`	`import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;`
`59`	`58`	`import static com.oracle.graal.python.util.PythonUtils.tsLiteral;`
`60`	`59`
`@@ -391,7 +390,7 @@ protected Object decode(VirtualFrame frame, Object value, TruffleString encoding`
`391`	`390`
`392`	`391`	`protected Object escapeDecode(VirtualFrame frame, PythonObjectFactory factory, byte[] data, int offset, int len) {`
`393`	`392`	`if (len == 0) {`
`394`		`- return factory.createBytes(EMPTY_BYTE_ARRAY);`
	`393`	`+ return factory.createEmptyBytes();`
`395`	`394`	`}`
`396`	`395`	`return escapeDecode(frame, PythonUtils.arrayCopyOfRange(data, offset, offset + len));`
`397`	`396`	`}`