Add missing interop-to-python value conversions

Author: msimacek

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

@@ -235,16 +235,16 @@ private boolean isAbstractMapping(PythonObjectLibrary thisLib) {
 
     @ExportMessage
     public void writeMember(String key, Object value,
-                    @Exclusive @Cached PInteropSubscriptAssignNode setItemNode,
+                    @Shared("setItemNode") @Cached PInteropSubscriptAssignNode setItemNode,
                     @CachedLibrary("this") PythonObjectLibrary dataModelLibrary,
                     @Exclusive @Cached KeyForAttributeAccess getAttributeKey,
                     @Exclusive @Cached KeyForItemAccess getItemKey,
-                    @Cached PInteropSetAttributeNode writeNode,
+                    @Cached PInteropSetAttributeNode setAttributeNode,
                     @Shared("attributeErrorProfile") @Cached IsBuiltinClassProfile attrErrorProfile) throws UnsupportedMessageException, UnknownIdentifierException {
         try {
             String attrKey = getAttributeKey.execute(key);
             if (attrKey != null) {
-                writeNode.execute(this, attrKey, value);
+                setAttributeNode.execute(this, attrKey, value);
                 return;
             }
 
@@ -256,14 +256,14 @@ public void writeMember(String key, Object value,
 
             if (this instanceof PythonObject) {
                 if (objectHasAttribute(this, key)) {
-                    writeNode.execute(this, key, value);
+                    setAttributeNode.execute(this, key, value);
                     return;
                 }
             }
             if (isAbstractMapping(dataModelLibrary)) {
                 setItemNode.execute(this, key, value);
             } else {
-                writeNode.execute(this, key, value);
+                setAttributeNode.execute(this, key, value);
             }
         } catch (PException e) {
             e.expectAttributeError(attrErrorProfile);
@@ -347,7 +347,7 @@ public Object readArrayElement(long key,
     @ExportMessage
     public void writeArrayElement(long key, Object value,
                     @CachedLibrary("this") PythonObjectLibrary dataModelLibrary,
-                    @Exclusive @Cached PInteropSubscriptAssignNode setItemNode) throws UnsupportedMessageException, InvalidArrayIndexException {
+                    @Shared("setItemNode") @Cached PInteropSubscriptAssignNode setItemNode) throws UnsupportedMessageException, InvalidArrayIndexException {
         if (dataModelLibrary.isSequence(this)) {
             try {
                 setItemNode.execute(this, key, value);
@@ -1867,13 +1867,14 @@ public abstract static class PInteropSubscriptAssignNode extends Node {
 
         @Specialization
         static void doSpecialObject(PythonAbstractObject primary, Object key, Object value,
+                        @Cached PForeignToPTypeNode convert,
                         @Cached PInteropGetAttributeNode getAttributeNode,
                         @Cached CallBinaryMethodNode callSetItemNode,
                         @Cached ConditionProfile profile) throws UnsupportedMessageException {
 
             Object attrSetitem = getAttributeNode.execute(primary, __SETITEM__);
             if (profile.profile(attrSetitem != PNone.NO_VALUE)) {
-                callSetItemNode.executeObject(attrSetitem, key, value);
+                callSetItemNode.executeObject(attrSetitem, key, convert.executeConvert(value));
             } else {
                 throw UnsupportedMessageException.create();
             }
@@ -1890,15 +1891,16 @@ public abstract static class PInteropSetAttributeNode extends Node {
         public abstract void execute(Object primary, String attrName, Object value) throws UnsupportedMessageException, UnknownIdentifierException;
 
         @Specialization
-        public void doSpecialObject(PythonAbstractObject primary, String attrName, Object value,
+        public static void doSpecialObject(PythonAbstractObject primary, String attrName, Object value,
+                        @Cached PForeignToPTypeNode convert,
                         @Cached LookupInheritedAttributeNode.Dynamic lookupSetAttrNode,
                         @Cached CallTernaryMethodNode callSetAttrNode,
                         @Cached ConditionProfile profile,
                         @Cached IsBuiltinClassProfile attrErrorProfile) throws UnsupportedMessageException, UnknownIdentifierException {
-            Object attrGetattribute = lookupSetAttrNode.execute(primary, SpecialMethodNames.__SETATTR__);
-            if (profile.profile(attrGetattribute != PNone.NO_VALUE)) {
+            Object attrSetattr = lookupSetAttrNode.execute(primary, SpecialMethodNames.__SETATTR__);
+            if (profile.profile(attrSetattr != PNone.NO_VALUE)) {
                 try {
-                    callSetAttrNode.execute(null, attrGetattribute, primary, attrName, value);
+                    callSetAttrNode.execute(null, attrSetattr, primary, attrName, convert.executeConvert(value));
                 } catch (PException e) {
                     e.expectAttributeError(attrErrorProfile);
                     // TODO(fa) not accurate; distinguish between read-only and non-existing
@@ -2086,9 +2088,11 @@ public static int systemHashCode(Object value) {
     }
 
     @ExportMessage
-    public TriState isIdenticalOrUndefined(Object other,
+    public TriState isIdenticalOrUndefined(Object otherInterop,
+                    @Cached PForeignToPTypeNode convert,
                     @CachedLibrary(limit = "3") InteropLibrary otherLib,
                     @CachedLibrary("this") PythonObjectLibrary objectLib) {
+        Object other = convert.executeConvert(otherInterop);
         if (this == other) {
             return TriState.TRUE;
         } else if (otherLib.hasIdentity(other)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.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.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.nodes.literal.ListLiteralNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.PSequence;
@@ -187,9 +188,10 @@ public boolean isArrayElementRemovable(long index,
 
     @ExportMessage
     public void writeArrayElement(long index, Object value,
+                    @Cached PForeignToPTypeNode convert,
                     @Cached.Exclusive @Cached SequenceStorageNodes.SetItemScalarNode setItem) throws InvalidArrayIndexException {
         try {
-            setItem.execute(store, PInt.intValueExact(index), value);
+            setItem.execute(store, PInt.intValueExact(index), convert.executeConvert(value));
         } catch (OverflowException e) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             throw InvalidArrayIndexException.create(index);