Fix missing conversion in writeMember/writeArrayElement

Author: msimacek

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/JavaInteropTest.java

@@ -595,6 +595,25 @@ public void writableBindings() {
             assertEquals(javaObj.asInt(), 42);
         }
 
+        @Test
+        public void testDictTypeConversion() {
+            Value bindings = context.getBindings("python");
+            bindings.putMember("foo", "32");
+            bindings.putMember("bar", (short) 32);
+            Value intValue = context.eval("python", "int(foo) + int(bar)");
+            assertEquals(intValue.asInt(), 64);
+        }
+
+        @Test
+        public void testListTypeConversions() {
+            Value intConversion = context.eval("python", "int");
+            Value list = context.eval("python", "[1]");
+            list.setArrayElement(0, "32");
+            assertEquals(intConversion.execute(list.getArrayElement(0)).asInt(), 32);
+            list.setArrayElement(0, (short) 3);
+            assertEquals(intConversion.execute(list.getArrayElement(0)).asInt(), 3);
+        }
+
         public class UnsupportedProxyHashMap implements ProxyHashMap {
             @Override
             public long getHashSize() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -227,13 +227,14 @@ public final void clearNativeWrapper() {
     public void writeMember(String key, Object value,
                     @Bind("$node") Node inliningTarget,
                     @Exclusive @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
+                    @Shared @Cached PForeignToPTypeNode convert,
                     @Exclusive @Cached PyObjectSetAttr setAttributeNode,
                     // GR-44020: make shared:
                     @Exclusive @Cached IsBuiltinObjectProfile attrErrorProfile,
                     @Exclusive @Cached GilNode gil) throws UnsupportedMessageException, UnknownIdentifierException {
         boolean mustRelease = gil.acquire();
         try {
-            setAttributeNode.execute(null, inliningTarget, this, fromJavaStringNode.execute(key, TS_ENCODING), value);
+            setAttributeNode.execute(null, inliningTarget, this, fromJavaStringNode.execute(key, TS_ENCODING), convert.executeConvert(value));
         } catch (PException e) {
             e.expectAttributeError(inliningTarget, attrErrorProfile);
             // TODO(fa) not accurate; distinguish between read-only and non-existing
@@ -325,10 +326,12 @@ public void writeArrayElement(long key, Object value,
                     @Bind("$node") Node inliningTarget,
                     @Shared("getBehavior") @Cached GetInteropBehaviorNode getBehavior,
                     @Shared("getValue") @Cached GetInteropBehaviorValueNode getValue,
+                    @Shared @Cached PForeignToPTypeNode convert,
                     @Cached PySequenceSetItemNode sequenceSetItemNode,
                     @Exclusive @Cached GilNode gil) throws UnsupportedMessageException, InvalidArrayIndexException {
         boolean mustRelease = gil.acquire();
         try {
+            value = convert.executeConvert(value);
             InteropBehaviorMethod method = InteropBehaviorMethod.write_array_element;
             InteropBehavior behavior = getBehavior.execute(inliningTarget, this, method);
             if (behavior != null) {
@@ -1520,7 +1523,7 @@ public static String objectHashCodeAsHexString(Object value) {
 
     @ExportMessage
     public TriState isIdenticalOrUndefined(Object otherInterop,
-                    @Cached PForeignToPTypeNode convert,
+                    @Shared @Cached PForeignToPTypeNode convert,
                     @Exclusive @CachedLibrary(limit = "3") InteropLibrary otherLib,
                     @Cached IsNode isNode,
                     @Exclusive @Cached GilNode gil) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PArray.java

@@ -43,6 +43,7 @@
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
+import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeByteSequenceStorage;
@@ -55,6 +56,7 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
@@ -345,8 +347,8 @@ public long getArraySize() {
     @ExportMessage
     public Object readArrayElement(long index,
                     @Bind("$node") Node inliningTarget,
-                    @Cached.Exclusive @Cached SequenceStorageNodes.GetItemScalarNode getItem,
-                    @Cached.Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
+                    @Exclusive @Cached SequenceStorageNodes.GetItemScalarNode getItem,
+                    @Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
         boolean mustRelease = gil.acquire();
         try {
             try {
@@ -363,12 +365,13 @@ public Object readArrayElement(long index,
     @ExportMessage
     public void writeArrayElement(long index, Object value,
                     @Bind("$node") Node inliningTarget,
-                    @Cached.Exclusive @Cached SequenceStorageNodes.SetItemScalarNode setItem,
-                    @Cached.Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
+                    @Exclusive @Cached SequenceStorageNodes.SetItemScalarNode setItem,
+                    @Exclusive @Cached PForeignToPTypeNode convert,
+                    @Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
         boolean mustRelease = gil.acquire();
         try {
             try {
-                setItem.execute(inliningTarget, storage, PInt.intValueExact(index), value);
+                setItem.execute(inliningTarget, storage, PInt.intValueExact(index), convert.executeConvert(value));
             } catch (OverflowException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw InvalidArrayIndexException.create(index);
@@ -381,8 +384,8 @@ public void writeArrayElement(long index, Object value,
     @ExportMessage
     public void removeArrayElement(long index,
                     @Bind("$node") Node inliningTarget,
-                    @Cached.Exclusive @Cached SequenceStorageNodes.DeleteItemNode delItem,
-                    @Cached.Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
+                    @Exclusive @Cached SequenceStorageNodes.DeleteItemNode delItem,
+                    @Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
         boolean mustRelease = gil.acquire();
         try {
             try {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java

@@ -35,6 +35,7 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
+import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
@@ -150,11 +151,12 @@ public boolean isArrayElementRemovable(long index,
     public void writeArrayElement(long index, Object value,
                     @Bind("$node") Node inliningTarget,
                     @Exclusive @Cached SequenceStorageNodes.SetItemScalarNode setItem,
+                    @Exclusive @Cached PForeignToPTypeNode convert,
                     @Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
         boolean mustRelease = gil.acquire();
         try {
             try {
-                setItem.execute(inliningTarget, store, PInt.intValueExact(index), value);
+                setItem.execute(inliningTarget, store, PInt.intValueExact(index), convert.executeConvert(value));
             } catch (OverflowException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw InvalidArrayIndexException.create(index);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/interop/PythonLocalScope.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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 java.util.Map;
 
 import com.oracle.graal.python.PythonLanguage;
+import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.Frame;
@@ -157,7 +158,7 @@ void writeMember(String member, Object value) throws UnknownIdentifierException,
             if (slot == null) {
                 throw UnknownIdentifierException.create(member);
             } else {
-                frame.setObject(slot, value);
+                frame.setObject(slot, PForeignToPTypeNode.getUncached().executeConvert(value));
             }
         } else {
             throw UnsupportedMessageException.create();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PSequence.java

@@ -29,6 +29,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
+import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.OverflowException;
@@ -191,12 +192,13 @@ public Object readArrayElement(long index,
     public void writeArrayElement(long index, Object value,
                     @Bind("$node") Node inliningTarget,
                     @Exclusive @Cached SequenceNodes.GetSequenceStorageNode getSequenceStorageNode,
+                    @Exclusive @Cached PForeignToPTypeNode convert,
                     @Exclusive @Cached SequenceStorageNodes.SetItemScalarNode setItem,
                     @Exclusive @Cached GilNode gil) throws InvalidArrayIndexException {
         boolean mustRelease = gil.acquire();
         try {
             try {
-                setItem.execute(inliningTarget, getSequenceStorageNode.execute(inliningTarget, this), PInt.intValueExact(index), value);
+                setItem.execute(inliningTarget, getSequenceStorageNode.execute(inliningTarget, this), PInt.intValueExact(index), convert.executeConvert(value));
             } catch (OverflowException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw InvalidArrayIndexException.create(index);