Fix: convert arguments to 'int' if possible.

Author: fangerer

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

@@ -69,8 +69,8 @@
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
-import com.oracle.graal.python.builtins.objects.common.SequenceNodes.LenNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
+import com.oracle.graal.python.builtins.objects.common.SequenceNodes.LenNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ToByteArrayNode;
@@ -85,6 +85,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.nodes.util.CastToIndexNode;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
@@ -329,14 +330,10 @@ Object fstat(int fd,
         }
 
         @Specialization
-        Object fstatPInt(PInt fd,
+        Object fstatPInt(Object fd,
+                        @Cached("createOverflow()") CastToIndexNode castToIntNode,
                         @Cached("create()") FstatNode recursive) {
-            return recursive.executeWith(fd.intValue());
-        }
-
-        @Fallback
-        Object doGeneric(Object o) {
-            throw raise(TypeError, "an integer is required (got type %p)", o);
+            return recursive.executeWith(castToIntNode.execute(fd));
         }
 
         protected static StatNode createStatNode() {
@@ -775,9 +772,10 @@ Object writeStd(int fd, PByteArray data) {
         }
 
         @Specialization
-        Object writePInt(PInt fd, Object data,
+        Object writePInt(Object fd, Object data,
+                        @Cached("createOverflow()") CastToIndexNode castToIntNode,
                         @Cached("create()") WriteNode recursive) {
-            return recursive.executeWith(fd.intValue(), data);
+            return recursive.executeWith(castToIntNode.execute(fd), data);
         }
 
         private byte[] getByteArray(PIBytesLike pByteArray) {
@@ -788,7 +786,7 @@ private byte[] getByteArray(PIBytesLike pByteArray) {
             return toByteArrayNode.execute(pByteArray.getSequenceStorage());
         }
 
-        protected WriteNode create() {
+        public static WriteNode create() {
             return PosixModuleBuiltinsFactory.WriteNodeFactory.create(null);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -62,6 +62,7 @@
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.BoolNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.ByteNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.DoubleNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.DynamicObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.IntNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.LongNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PrimitiveNativeWrapper;
@@ -265,20 +266,22 @@ public abstract static class ToSulongNode extends CExtBaseNode {
 
         public abstract Object execute(Object obj);
 
-        /*
-         * This is very sad. Only for Sulong, we cannot hand out java.lang.Strings, because then it
-         * won't know what to do with them when they go native. So all places where Strings may be
-         * passed from Python into C code need to wrap Strings into PStrings.
-         */
         @Specialization
         Object doString(String str,
                         @Cached("createBinaryProfile()") ConditionProfile noWrapperProfile) {
             return PythonObjectNativeWrapper.wrap(factory().createString(str), noWrapperProfile);
         }
 
         @Specialization
-        Object doBoolean(boolean b) {
-            return BoolNativeWrapper.create(b);
+        Object doBoolean(boolean b,
+                        @Cached("createBinaryProfile()") ConditionProfile profile) {
+            PInt boxed = factory().createInt(b);
+            DynamicObjectNativeWrapper nativeWrapper = boxed.getNativeWrapper();
+            if (profile.profile(nativeWrapper == null)) {
+                nativeWrapper = BoolNativeWrapper.create(b);
+                boxed.setNativeWrapper(nativeWrapper);
+            }
+            return nativeWrapper;
         }
 
         @Specialization
@@ -368,7 +371,7 @@ public abstract static class AsPythonObjectNode extends CExtBaseNode {
 
         @Child GetClassNode getClassNode;
 
-        @Specialization(guards = "!isMaterialized(object)")
+        @Specialization
         boolean doBoolNativeWrapper(BoolNativeWrapper object) {
             return object.getValue();
         }
@@ -455,7 +458,7 @@ Object run(Object obj) {
         }
 
         protected static boolean isPrimitiveNativeWrapper(PythonNativeWrapper object) {
-            return object instanceof PrimitiveNativeWrapper && !isMaterialized((PrimitiveNativeWrapper) object);
+            return object instanceof PrimitiveNativeWrapper && !isMaterialized((PrimitiveNativeWrapper) object) || object instanceof BoolNativeWrapper;
         }
 
         protected boolean isForeignObject(TruffleObject obj) {