[GR-25988] Add missing TruffleBoundaries

fangerer · fangerer · commit 692bb88e4946 · 2020-09-07T15:45:59.000Z
PullRequest: graalpython/1255
diff --git a/graalpython/com.oracle.graal.python.cext/setup.py b/graalpython/com.oracle.graal.python.cext/setup.py
@@ -47,7 +47,13 @@
 import _sysconfig
 
 __dir__ = __file__.rpartition("/")[0]
-cflags_warnings = ["-Wno-int-to-pointer-cast", "-Wno-int-conversion", "-Wno-incompatible-pointer-types-discards-qualifiers", "-Wno-pointer-type-mismatch", "-Wno-braced-scalar-init"]
+cflags_warnings = [ "-Wno-int-to-pointer-cast"
+                  , "-Wno-int-conversion"
+                  , "-Wno-incompatible-pointer-types-discards-qualifiers"
+                  , "-Wno-pointer-type-mismatch"
+                  , "-Wno-braced-scalar-init"
+                  , "-Wno-deprecated-declarations"
+                  ]
 libpython_name = "libpython"
 libhpy_name = "libhpy"
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ZLibModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ZLibModuleBuiltins.java
@@ -393,14 +393,11 @@ abstract static class DeflateCompress extends PythonTernaryBuiltinNode {
         Object deflateCompress(VirtualFrame frame, DeflaterWrapper stream, Object pb, int mode) {
             byte[] data = toBytes.execute(frame, pb);
             byte[] result = new byte[DEF_BUF_SIZE];
-
-            ByteArrayOutputStream baos = deflate(stream, mode, data, result);
-
-            return factory().createBytes(baos.toByteArray());
+            return factory().createBytes(deflate(stream, mode, data, result));
         }
 
         @TruffleBoundary
-        private static ByteArrayOutputStream deflate(DeflaterWrapper stream, int mode, byte[] data, byte[] result) {
+        private static byte[] deflate(DeflaterWrapper stream, int mode, byte[] data, byte[] result) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             stream.deflater.setInput(data);
             int deflateMode = mode;
@@ -418,7 +415,7 @@ private static ByteArrayOutputStream deflate(DeflaterWrapper stream, int mode, b
             if (mode == Z_FINISH) {
                 stream.deflater.end();
             }
-            return baos;
+            return baos.toByteArray();
         }
     }
 
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
@@ -51,6 +51,7 @@
 import java.nio.charset.CodingErrorAction;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -1401,12 +1402,28 @@ private int getIntValue(long from) {
 
         private PList getBytesResult(List<byte[]> bytes) {
             PList result = factory().createList();
-            for (byte[] bs : bytes) {
-                getAppendNode().execute(result, factory().createBytes(bs));
+            Iterator<byte[]> it = iterator(bytes);
+            while (hasNext(it)) {
+                getAppendNode().execute(result, factory().createBytes(next(it)));
             }
             return result;
         }
 
+        @TruffleBoundary(allowInlining = true)
+        private static Iterator<byte[]> iterator(List<byte[]> bytes) {
+            return bytes.iterator();
+        }
+
+        @TruffleBoundary(allowInlining = true)
+        private static byte[] next(Iterator<byte[]> it) {
+            return it.next();
+        }
+
+        @TruffleBoundary(allowInlining = true)
+        private static boolean hasNext(Iterator<byte[]> it) {
+            return it.hasNext();
+        }
+
         private PList getByteArrayResult(List<byte[]> bytes) {
             PList result = factory().createList();
             for (byte[] bs : bytes) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/InvalidateNativeObjectsAllManagedNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/InvalidateNativeObjectsAllManagedNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -44,6 +44,7 @@
 import com.oracle.graal.python.builtins.objects.cext.InvalidateNativeObjectsAllManagedNodeFactory.InvalidateNativeObjectsAllManagedCachedNodeGen;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 
@@ -54,6 +55,7 @@ public abstract class InvalidateNativeObjectsAllManagedNode extends PNodeWithCon
     abstract static class InvalidateNativeObjectsAllManagedCachedNode extends InvalidateNativeObjectsAllManagedNode {
 
         @Specialization(assumptions = {"singleContextAssumption()", "nativeObjectsAllManagedAssumption"})
+        @TruffleBoundary
         void doValid(
                         @Cached("nativeObjectsAllManagedAssumption()") Assumption nativeObjectsAllManagedAssumption) {
             nativeObjectsAllManagedAssumption.invalidate();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java
@@ -231,7 +231,7 @@ static Object notStringLoop(DynamicObjectStorage self, Object key, ThreadState s
                         @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState,
                         @Exclusive @Cached("createBinaryProfile()") ConditionProfile noValueProfile) {
             long hash = self.getHashWithState(key, lib, state, gotState);
-            Iterator<Object> keys = self.store.getShape().getKeys().iterator();
+            Iterator<Object> keys = getKeysIterator(self.store.getShape());
             while (hasNext(keys)) {
                 Object currentKey = getNext(keys);
                 if (currentKey instanceof String) {
@@ -252,6 +252,11 @@ static Object notStringLoop(DynamicObjectStorage self, Object key, ThreadState s
             return null;
         }
 
+        @TruffleBoundary
+        private static Iterator<Object> getKeysIterator(Shape shape) {
+            return shape.getKeys().iterator();
+        }
+
         @TruffleBoundary
         private static Object getNext(Iterator<Object> keys) {
             return keys.next();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java
@@ -164,6 +164,7 @@ public Object[] getDefaults() {
         return defaultValues;
     }
 
+    @TruffleBoundary
     public void setDefaults(Object[] defaults) {
         this.defaultsStableAssumption.invalidate("defaults changed for function " + getName());
         this.defaultValues = defaults;
@@ -173,6 +174,7 @@ public PKeyword[] getKwDefaults() {
         return kwDefaultValues;
     }
 
+    @TruffleBoundary
     public void setKwDefaults(PKeyword[] defaults) {
         this.defaultsStableAssumption.invalidate("kw defaults changed for function " + getName());
         this.kwDefaultValues = defaults;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java
@@ -2501,7 +2501,7 @@ static String doPInt(PInt self) {
         @Specialization(limit = "1")
         static String doNativeVoidPtr(PythonNativeVoidPtr self,
                         @CachedLibrary("self") PythonObjectLibrary lib) {
-            return Long.toString(lib.hash(self));
+            return doL(lib.hash(self));
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java
@@ -319,6 +319,11 @@ private static String toString(BigInteger value) {
         return value.toString();
     }
 
+    @TruffleBoundary
+    public static String toHexString(long value) {
+        return Long.toHexString(value);
+    }
+
     @TruffleBoundary
     public static BigInteger longToBigInteger(long value) {
         return BigInteger.valueOf(value);
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
@@ -510,38 +510,35 @@ PBytes read(VirtualFrame frame, PMMap self, Object n,
     abstract static class ReadlineNode extends PythonUnaryBuiltinNode implements ByteReadingNode {
 
         @Specialization
-        Object readline(PMMap self,
-                        @Cached SequenceStorageNodes.AppendNode appendNode) {
-
+        Object readline(PMMap self) {
             try {
-                ByteBuffer buf = ByteBuffer.allocate(4096);
-                SeekableByteChannel channel = self.getChannel();
-                ByteSequenceStorage res = new ByteSequenceStorage(16);
-                // search for newline char
-                outer: while (readIntoBuffer(channel, buf) > 0) {
-                    buf.flip();
-                    while (buf.hasRemaining()) {
-                        byte b = buf.get();
-                        // CPython really tests for '\n' only
-                        if (b != (byte) '\n') {
-                            appendNode.execute(res, b, BytesLikeNoGeneralizationNode.SUPPLIER);
-                        } else {
-                            // recover correct position (i.e. number of remaining bytes in buffer)
-                            PMMap.position(channel, PMMap.position(channel) - buf.remaining() - 1);
-                            break outer;
-                        }
-                    }
-                    buf.clear();
-                }
-                return factory().createBytes(res);
+                return factory().createBytes(doReadline(self.getChannel()));
             } catch (IOException e) {
                 throw raise(PythonBuiltinClassType.OSError, e);
             }
         }
 
-        @TruffleBoundary(allowInlining = true)
-        private static int readIntoBuffer(SeekableByteChannel ch, ByteBuffer dst) throws IOException {
-            return ch.read(dst);
+        @TruffleBoundary
+        static ByteSequenceStorage doReadline(SeekableByteChannel channel) throws IOException {
+            ByteBuffer buf = ByteBuffer.allocate(4096);
+            ByteSequenceStorage res = new ByteSequenceStorage(16);
+            // search for newline char
+            outer: while (channel.read(buf) > 0) {
+                buf.flip();
+                while (buf.hasRemaining()) {
+                    byte b = buf.get();
+                    // CPython really tests for '\n' only
+                    if (b != (byte) '\n') {
+                        SequenceStorageNodes.AppendNode.getUncached().execute(res, b, BytesLikeNoGeneralizationNode.SUPPLIER);
+                    } else {
+                        // recover correct position (i.e. number of remaining bytes in buffer)
+                        PMMap.position(channel, PMMap.position(channel) - buf.remaining() - 1);
+                        break outer;
+                    }
+                }
+                buf.clear();
+            }
+            return res;
         }
     }
 
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
@@ -399,7 +399,7 @@ Object recvInto(VirtualFrame frame, PSocket socket, PMemoryView buffer, Object f
                         @Cached("create(__SETITEM__)") LookupAndCallTernaryNode setItem) {
             int bufferLen = lib.asSizeWithState(callLen.executeObject(frame, buffer), PArguments.getThreadState(frame));
             byte[] targetBuffer = new byte[bufferLen];
-            ByteBuffer byteBuffer = ByteBuffer.wrap(targetBuffer);
+            ByteBuffer byteBuffer = wrap(targetBuffer);
             int length;
             try {
                 length = fillBuffer(socket, byteBuffer);
@@ -436,7 +436,7 @@ Object recvInto(VirtualFrame frame, PSocket socket, PByteArray buffer, Object fl
                 }
             } else {
                 byte[] targetBuffer = new byte[bufferLen];
-                ByteBuffer byteBuffer = ByteBuffer.wrap(targetBuffer);
+                ByteBuffer byteBuffer = wrap(targetBuffer);
                 int length;
                 try {
                     length = fillBuffer(socket, byteBuffer);
@@ -458,6 +458,11 @@ private static int fillBuffer(PSocket socket, ByteBuffer byteBuffer) throws IOEx
             SocketChannel nativeSocket = socket.getSocket();
             return nativeSocket.read(byteBuffer);
         }
+
+        @TruffleBoundary
+        private static ByteBuffer wrap(byte[] data) {
+            return ByteBuffer.wrap(data);
+        }
     }
 
     // recvmsg(bufsize[, ancbufsize[, flags]])
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java
@@ -301,6 +301,11 @@ public static boolean isWhitespace(int codePoint) {
         return Character.isWhitespace(codePoint);
     }
 
+    @TruffleBoundary(allowInlining = true)
+    public static int codePointCount(String str, int beginIndex, int endIndex) {
+        return str.codePointCount(beginIndex, endIndex);
+    }
+
     @Ignore
     @TruffleBoundary
     public static boolean equals(String left, String other) {
@@ -316,6 +321,11 @@ public static String cat(Object... args) {
         return sb.toString();
     }
 
+    @TruffleBoundary(allowInlining = true)
+    public static boolean startsWith(String left, String prefix) {
+        return left.startsWith(prefix);
+    }
+
     @Override
     public void setSequenceStorage(SequenceStorage store) {
         CompilerDirectives.transferToInterpreterAndInvalidate();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java
@@ -142,6 +142,7 @@
 import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -1986,14 +1987,15 @@ private static String doTitle(String self) {
 
     @Builtin(name = "center", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 3)
     @GenerateNodeFactory
+    @ImportStatic(PString.class)
     abstract static class CenterNode extends PythonBuiltinNode {
 
         @Specialization(guards = "isNoValue(fill)")
         String doStringInt(String self, int width, @SuppressWarnings("unused") PNone fill) {
             return make(self, width, " ");
         }
 
-        @Specialization(guards = "fill.codePointCount(0, fill.length()) == 1")
+        @Specialization(guards = "codePointCount(fill, 0, fill.length()) == 1")
         String doStringIntString(String self, int width, String fill) {
             return make(self, width, fill);
         }
@@ -2004,7 +2006,7 @@ String doStringObjectObject(VirtualFrame frame, String self, Object width, Objec
                         @Shared("castFillNode") @Cached CastToJavaStringCheckedNode castFillNode,
                         @Shared("errorProfile") @Cached("createBinaryProfile()") ConditionProfile errorProfile) {
             String fillStr = PGuards.isNoValue(fill) ? " " : castFillNode.cast(fill, "", fill);
-            if (errorProfile.profile(fillStr.codePointCount(0, fillStr.length()) != 1)) {
+            if (errorProfile.profile(PString.codePointCount(fillStr, 0, fillStr.length()) != 1)) {
                 throw raise(TypeError, ErrorMessages.FILL_CHAR_MUST_BE_LENGTH_1);
             }
             return make(self, lib.asSizeWithState(width, PArguments.getThreadState(frame)), fillStr);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringNodes.java
@@ -455,7 +455,7 @@ static char[] doObject(char[] translatedChars, int i, Object translated,
         }
 
         private static PException raiseError(PRaiseNode raise) {
-            return raise.raise(ValueError, ErrorMessages.CHARACTER_MAPPING_MUST_BE_IN_RANGE, Integer.toHexString(Character.MAX_CODE_POINT + 1));
+            return raise.raise(ValueError, ErrorMessages.CHARACTER_MAPPING_MUST_BE_IN_RANGE, PInt.toHexString(Character.MAX_CODE_POINT + 1));
         }
 
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PRLock.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PRLock.java
@@ -72,6 +72,7 @@ private static InternalReentrantLock allocateLock() {
         return new InternalReentrantLock();
     }
 
+    @TruffleBoundary
     public boolean isOwned() {
         return lock.isHeldByCurrentThread();
     }
@@ -123,6 +124,7 @@ public void release() {
     }
 
     @Override
+    @TruffleBoundary
     public boolean locked() {
         return lock.isLocked();
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportStarNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportStarNode.java
@@ -34,6 +34,7 @@
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
@@ -150,7 +151,7 @@ public void executeVoid(VirtualFrame frame) {
                 for (String name : exportedModuleAttrs) {
                     // skip attributes with leading '__' if there was no '__all__' attribute (see
                     // 'ceval.c: import_all_from')
-                    if (!name.startsWith("__")) {
+                    if (!PString.startsWith(name, "__")) {
                         Object attr = readAttribute(frame, importedModule, name);
                         writeAttribute(frame, locals, name, attr);
                     }

Original file line number	Diff line number	Diff line change
`@@ -393,14 +393,11 @@ abstract static class DeflateCompress extends PythonTernaryBuiltinNode {`
`393`	`393`	`Object deflateCompress(VirtualFrame frame, DeflaterWrapper stream, Object pb, int mode) {`
`394`	`394`	`byte[] data = toBytes.execute(frame, pb);`
`395`	`395`	`byte[] result = new byte[DEF_BUF_SIZE];`
`396`		`-`
`397`		`- ByteArrayOutputStream baos = deflate(stream, mode, data, result);`
`398`		`-`
`399`		`- return factory().createBytes(baos.toByteArray());`
	`396`	`+ return factory().createBytes(deflate(stream, mode, data, result));`
`400`	`397`	`}`
`401`	`398`
`402`	`399`	`@TruffleBoundary`
`403`		`- private static ByteArrayOutputStream deflate(DeflaterWrapper stream, int mode, byte[] data, byte[] result) {`
	`400`	`+ private static byte[] deflate(DeflaterWrapper stream, int mode, byte[] data, byte[] result) {`
`404`	`401`	`ByteArrayOutputStream baos = new ByteArrayOutputStream();`
`405`	`402`	`stream.deflater.setInput(data);`
`406`	`403`	`int deflateMode = mode;`
`@@ -418,7 +415,7 @@ private static ByteArrayOutputStream deflate(DeflaterWrapper stream, int mode, b`
`418`	`415`	`if (mode == Z_FINISH) {`
`419`	`416`	`stream.deflater.end();`
`420`	`417`	`}`
`421`		`- return baos;`
	`418`	`+ return baos.toByteArray();`
`422`	`419`	`}`
`423`	`420`	`}`
`424`	`421`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ public Object[] getDefaults() {`
`164`	`164`	`return defaultValues;`
`165`	`165`	`}`
`166`	`166`
	`167`	`+ @TruffleBoundary`
`167`	`168`	`public void setDefaults(Object[] defaults) {`
`168`	`169`	`this.defaultsStableAssumption.invalidate("defaults changed for function " + getName());`
`169`	`170`	`this.defaultValues = defaults;`
`@@ -173,6 +174,7 @@ public PKeyword[] getKwDefaults() {`
`173`	`174`	`return kwDefaultValues;`
`174`	`175`	`}`
`175`	`176`
	`177`	`+ @TruffleBoundary`
`176`	`178`	`public void setKwDefaults(PKeyword[] defaults) {`
`177`	`179`	`this.defaultsStableAssumption.invalidate("kw defaults changed for function " + getName());`
`178`	`180`	`this.kwDefaultValues = defaults;`
Original file line number	Diff line number	Diff line change
`@@ -2501,7 +2501,7 @@ static String doPInt(PInt self) {`
`2501`	`2501`	`@Specialization(limit = "1")`
`2502`	`2502`	`static String doNativeVoidPtr(PythonNativeVoidPtr self,`
`2503`	`2503`	`@CachedLibrary("self") PythonObjectLibrary lib) {`
`2504`		`- return Long.toString(lib.hash(self));`
	`2504`	`+ return doL(lib.hash(self));`
`2505`	`2505`	`}`
`2506`	`2506`	`}`
`2507`	`2507`