[GR-20057] Moved CoerceToString and CoerceToFileDescriptorNode functionality into PythonObjectLibrary.

PullRequest: graalpython/930

Author: tomasstupka

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

@@ -262,6 +262,18 @@ def test_key_info():
         assert not polyglot.__key_info__(builtinObj, "__len__", "removable")
         assert not polyglot.__key_info__(builtinObj, "__len__", "insertable")
 
+    def test_java_classpath():
+        import java
+        try:
+            java.add_to_classpath(1)
+        except TypeError as e:
+            assert "classpath argument 1 must be string, not int" in str(e)
+            
+        try:
+            java.add_to_classpath('a', 1)
+        except TypeError as e:
+            assert "classpath argument 2 must be string, not int" in str(e)
+        
     def test_host_lookup():
         import java
         try:

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

@@ -0,0 +1,46 @@
+# Copyright (c) 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+def test_select_raises_on_object_with_no_fileno_func():    
+    import select
+    try :
+        select.select('abc', [], [], 0)
+    except TypeError:
+        raised = True
+    assert raised

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

@@ -0,0 +1,46 @@
+# Copyright (c) 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+def test_SemLock_raises_on_non_string_name():    
+    from _multiprocessing import SemLock
+    try :
+        SemLock(kind=1, value=1, name={1:2}, maxvalue=1, unlink=1)
+    except TypeError:
+        raised = True
+    assert raised

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

@@ -57,4 +57,12 @@ def test_inet_aton_errs(self):
         self.assertRaises(OSError, lambda : socket.inet_aton('oracle.com'))
         self.assertRaises(OSError, lambda : socket.inet_aton('0x7000000000000000'))
         self.assertRaises(OSError, lambda : socket.inet_aton('255.255.256.1'))
-        self.assertRaises(TypeError, lambda : socket.inet_aton(255))
+        self.assertRaises(TypeError, lambda : socket.inet_aton(255))
+
+def test_get_name_info():    
+    import socket
+    try :
+        socket.getnameinfo((1, 0, 0, 0), 0)
+    except TypeError:
+        raised = True
+    assert raised

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -177,12 +177,12 @@
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.subscript.SliceLiteralNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToByteNode;
 import com.oracle.graal.python.nodes.util.CastToJavaIntNode;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNodeGen;
 import com.oracle.graal.python.nodes.util.CoerceToDoubleNode;
-import com.oracle.graal.python.nodes.util.CoerceToStringNode;
 import com.oracle.graal.python.nodes.util.SplitArgsNode;
 import com.oracle.graal.python.runtime.ExecutionContext.ForeignCallContext;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
@@ -1861,16 +1861,16 @@ Object strNoArgs(LazyPythonClass strClass, PNone arg, PNone encoding, PNone erro
         }
 
         @Specialization(guards = {"!isNativeClass(strClass)", "!isNoValue(obj)", "isNoValue(encoding)", "isNoValue(errors)"})
-        Object strOneArg(VirtualFrame frame, LazyPythonClass strClass, Object obj, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors,
-                        @Cached CoerceToStringNode coerceToStringNode) {
-            Object result = coerceToStringNode.execute(frame, obj);
+        Object strOneArg(LazyPythonClass strClass, Object obj, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors,
+                        @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
+            Object result = lib.asPString(obj);
 
             // try to return a primitive if possible
             if (getIsStringProfile().profile(result instanceof String)) {
                 return asPString(strClass, (String) result);
             }
 
-            // CoerceToStringNode guarantees that the returned object is an instanceof of 'str'
+            // PythonObjectLibrary guarantees that the returned object is an instanceof of 'str'
             return result;
         }
 
@@ -1906,11 +1906,12 @@ private Object decodeBytes(VirtualFrame frame, LazyPythonClass strClass, PBytes
          * into a natively allocated subtype structure
          */
         @Specialization(guards = {"isSubtypeOfString(frame, isSubtype, cls)", "isNoValue(encoding)", "isNoValue(errors)"}, limit = "1")
-        Object doNativeSubclass(VirtualFrame frame, PythonNativeClass cls, Object obj, @SuppressWarnings("unused") Object encoding, @SuppressWarnings("unused") Object errors,
+        Object doNativeSubclass(@SuppressWarnings("unused") VirtualFrame frame, PythonNativeClass cls, Object obj, @SuppressWarnings("unused") Object encoding,
+                        @SuppressWarnings("unused") Object errors,
                         @Cached @SuppressWarnings("unused") IsSubtypeNode isSubtype,
-                        @Cached CoerceToStringNode castToStringNode,
+                        @CachedLibrary(limit = "1") PythonObjectLibrary lib,
                         @Cached CExtNodes.StringSubtypeNew subtypeNew) {
-            return subtypeNew.call(cls, castToStringNode.execute(frame, obj));
+            return subtypeNew.call(cls, lib.asPString(obj));
         }
 
         protected static boolean isSubtypeOfString(VirtualFrame frame, IsSubtypeNode isSubtypeNode, PythonNativeClass cls) {
@@ -2197,7 +2198,12 @@ private String getModuleNameFromGlobals(PythonObject globals, HashingStorageLibr
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw new IllegalStateException("invalid globals object");
             }
-            return ensureCastToStringNode().execute(nameAttr);
+            try {
+                return ensureCastToStringNode().execute(nameAttr);
+            } catch (CannotCastException e) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                throw new IllegalStateException();
+            }
         }
 
         @SuppressWarnings("try")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -153,9 +153,8 @@
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
-import com.oracle.graal.python.nodes.util.CoerceToStringNode;
-import com.oracle.graal.python.nodes.util.CoerceToStringNodeGen;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.PythonOptions;
@@ -1466,28 +1465,29 @@ public abstract static class PrintNode extends PythonBuiltinNode {
         @Child private ReadAttributeFromObjectNode readStdout;
         @Child private GetAttributeNode getWrite = GetAttributeNode.create("write", null);
         @Child private CallNode callWrite = CallNode.create();
-        @Child private CoerceToStringNode toString = CoerceToStringNodeGen.create();
         @Child private LookupAndCallUnaryNode callFlushNode;
         @CompilationFinal private Assumption singleContextAssumption;
         @CompilationFinal private PythonModule cachedSys;
 
         @Specialization
         PNone printNoKeywords(VirtualFrame frame, Object[] values, @SuppressWarnings("unused") PNone sep, @SuppressWarnings("unused") PNone end, @SuppressWarnings("unused") PNone file,
-                        @SuppressWarnings("unused") PNone flush) {
+                        @SuppressWarnings("unused") PNone flush,
+                        @CachedLibrary(limit = "3") PythonObjectLibrary lib) {
             Object stdout = getStdout();
-            return printAllGiven(frame, values, DEFAULT_SEPARATOR, DEFAULT_END, stdout, false);
+            return printAllGiven(frame, values, DEFAULT_SEPARATOR, DEFAULT_END, stdout, false, lib);
         }
 
         @Specialization(guards = {"!isNone(file)", "!isNoValue(file)"})
-        PNone printAllGiven(VirtualFrame frame, Object[] values, String sep, String end, Object file, boolean flush) {
+        PNone printAllGiven(VirtualFrame frame, Object[] values, String sep, String end, Object file, boolean flush,
+                        @CachedLibrary(limit = "3") PythonObjectLibrary lib) {
             int lastValue = values.length - 1;
             Object write = getWrite.executeObject(frame, file);
             for (int i = 0; i < lastValue; i++) {
-                callWrite.execute(frame, write, toString.execute(frame, values[i]));
+                callWrite.execute(frame, write, lib.asPString(values[i]));
                 callWrite.execute(frame, write, sep);
             }
             if (lastValue >= 0) {
-                callWrite.execute(frame, write, toString.execute(frame, values[lastValue]));
+                callWrite.execute(frame, write, lib.asPString(values[lastValue]));
             }
             callWrite.execute(frame, write, end);
             if (flush) {
@@ -1505,14 +1505,19 @@ PNone printGeneric(VirtualFrame frame, Object[] values, Object sepIn, Object end
                         @Cached CastToJavaStringNode castSep,
                         @Cached CastToJavaStringNode castEnd,
                         @Cached("createIfTrueNode()") CoerceToBooleanNode castFlush,
-                        @Cached PRaiseNode raiseNode) {
-            String sep = sepIn instanceof PNone ? DEFAULT_SEPARATOR : castSep.execute(sepIn);
-            if (sep == null) {
+                        @Cached PRaiseNode raiseNode,
+                        @CachedLibrary(limit = "3") PythonObjectLibrary lib) {
+            String sep;
+            try {
+                sep = sepIn instanceof PNone ? DEFAULT_SEPARATOR : castSep.execute(sepIn);
+            } catch (CannotCastException e) {
                 throw raiseNode.raise(PythonBuiltinClassType.TypeError, "sep must be None or a string, not %p", sepIn);
             }
 
-            String end = endIn instanceof PNone ? DEFAULT_END : castEnd.execute(endIn);
-            if (end == null) {
+            String end;
+            try {
+                end = endIn instanceof PNone ? DEFAULT_END : castEnd.execute(endIn);
+            } catch (CannotCastException e) {
                 throw raiseNode.raise(PythonBuiltinClassType.TypeError, "end must be None or a string, not %p", sepIn);
             }
 
@@ -1528,7 +1533,7 @@ PNone printGeneric(VirtualFrame frame, Object[] values, Object sepIn, Object end
             } else {
                 flush = castFlush.executeBoolean(frame, flushIn);
             }
-            return printAllGiven(frame, values, sep, end, file, flush);
+            return printAllGiven(frame, values, sep, end, file, flush, lib);
         }
 
         private Object getStdout() {
@@ -1587,8 +1592,13 @@ public abstract static class AsciiNode extends PythonUnaryBuiltinNode {
         @Specialization(guards = "isString(obj)")
         public Object asciiString(Object obj,
                         @Cached CastToJavaStringNode castToJavaStringNode) {
-            String str = castToJavaStringNode.execute(obj);
-            return doAsciiString(str);
+            try {
+                String str = castToJavaStringNode.execute(obj);
+                return doAsciiString(str);
+            } catch (CannotCastException e) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                throw new IllegalStateException("should not be reached");
+            }
         }
 
         @TruffleBoundary