Fix setitem call and error handling

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mappingproxy/MappingproxyBuiltins.java

@@ -33,9 +33,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ITER__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETITEM__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.KeyError;
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
 import java.util.List;
 
@@ -51,11 +49,9 @@
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.dict.PDictView;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
-import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
-import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -168,16 +164,6 @@ Object getItem(VirtualFrame frame, PMappingproxy self, Object key,
         }
     }
 
-    @Builtin(name = __SETITEM__, minNumOfPositionalArgs = 3)
-    @GenerateNodeFactory
-    public abstract static class SetItemNode extends PythonTernaryBuiltinNode {
-        @Specialization
-        @SuppressWarnings("unused")
-        Object run(PMappingproxy self, Object key, Object value) {
-            throw raise(TypeError, ErrorMessages.OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT, "mappingproxy");
-        }
-    }
-
     @Builtin(name = __CONTAINS__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class ContainsNode extends PythonBuiltinNode {
@@ -241,5 +227,4 @@ PNotImplemented doGeneric(Object self, Object other) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
     }
-
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SetItemNode.java

@@ -26,14 +26,18 @@
 package com.oracle.graal.python.nodes.subscript;
 
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETITEM__;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
-import com.oracle.graal.python.builtins.objects.object.PythonObject;
-import com.oracle.graal.python.builtins.objects.type.TypeBuiltins.GetattributeNode;
+import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.call.special.CallTernaryMethodNode;
+import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.frame.WriteNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -45,6 +49,7 @@
 @NodeChild(value = "slice", type = ExpressionNode.class)
 @NodeChild(value = "right", type = ExpressionNode.class)
 public abstract class SetItemNode extends StatementNode implements WriteNode {
+    @Child private PRaiseNode raiseNode;
 
     public abstract ExpressionNode getPrimary();
 
@@ -105,22 +110,34 @@ public void executeWith(VirtualFrame frame, Object value) {
     public abstract void executeWith(VirtualFrame frame, Object primary, Object slice, Object value);
 
     @Specialization
-    void doSpecialObject(VirtualFrame frame, PythonObject primary, int index, Object value,
-                    @Cached("create()") GetattributeNode getSetitemNode,
-                    @Cached("create()") GetClassNode getClassNode,
-                    @Cached("create()") CallTernaryMethodNode callNode) {
-        Object primaryClass = getClassNode.execute(primary);
-        Object setItemMethod = getSetitemNode.execute(frame, primaryClass, __SETITEM__);
-        callNode.execute(frame, setItemMethod, primary, index, value);
+    void doIntIndex(VirtualFrame frame, Object primary, int index, Object value,
+                    @Cached GetClassNode getClassNode,
+                    @Cached("create(__SETITEM__)") LookupSpecialMethodNode lookupSetitem,
+                    @Cached CallTernaryMethodNode callSetitem) {
+        Object setitem = lookupSetitem.execute(frame, getClassNode.execute(primary), primary);
+        if (setitem == PNone.NO_VALUE) {
+            getRaiseNode().raise(TypeError, ErrorMessages.P_OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT, primary);
+        }
+        callSetitem.execute(frame, setitem, primary, index, value);
     }
 
-    @Specialization
-    void doSpecialObject1(VirtualFrame frame, Object primary, Object index, Object value,
-                    @Cached("create()") GetattributeNode getSetitemNode,
-                    @Cached("create()") GetClassNode getClassNode,
-                    @Cached("create()") CallTernaryMethodNode callNode) {
-        Object primaryClass = getClassNode.execute(primary);
-        Object setItemMethod = getSetitemNode.execute(frame, primaryClass, __SETITEM__);
-        callNode.execute(frame, setItemMethod, primary, index, value);
+    @Specialization(replaces = "doIntIndex")
+    void doGeneric(VirtualFrame frame, Object primary, Object index, Object value,
+                    @Cached GetClassNode getClassNode,
+                    @Cached("create(__SETITEM__)") LookupSpecialMethodNode lookupSetitem,
+                    @Cached CallTernaryMethodNode callSetitem) {
+        Object setitem = lookupSetitem.execute(frame, getClassNode.execute(primary), primary);
+        if (setitem == PNone.NO_VALUE) {
+            getRaiseNode().raise(TypeError, ErrorMessages.P_OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT, primary);
+        }
+        callSetitem.execute(frame, setitem, primary, index, value);
+    }
+
+    private PRaiseNode getRaiseNode() {
+        if (raiseNode == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            raiseNode = insert(PRaiseNode.create());
+        }
+        return raiseNode;
     }
 }