Add appropriate not-implemented handler to 'DeleteItemNode'.

Author: fangerer

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

@@ -28,7 +28,6 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.ITEMS;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.KEYS;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__CONTAINS__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ITER__;
@@ -167,16 +166,6 @@ Object run(PMappingproxy self, Object key, Object value) {
         }
     }
 
-    @Builtin(name = __DELITEM__, fixedNumOfArguments = 2)
-    @GenerateNodeFactory
-    public abstract static class DelItemNode extends PythonBinaryBuiltinNode {
-        @Specialization
-        @SuppressWarnings("unused")
-        Object run(PMappingproxy self, Object key) {
-            throw raise(TypeError, "'mappingproxy' object does not support item deletion");
-        }
-    }
-
     @Builtin(name = __CONTAINS__, fixedNumOfArguments = 2)
     @GenerateNodeFactory
     public abstract static class ContainsNode extends PythonBuiltinNode {

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

@@ -26,10 +26,15 @@
 package com.oracle.graal.python.nodes.subscript;
 
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELITEM__;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
+
+import java.util.function.Supplier;
 
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.nodes.PNode;
+import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
+import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode.NotImplementedHandler;
 import com.oracle.graal.python.nodes.expression.BinaryOpNode;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -38,6 +43,17 @@
 @NodeInfo(shortName = __DELITEM__)
 public abstract class DeleteItemNode extends BinaryOpNode {
 
+    private final Supplier<NotImplementedHandler> notImplementedHandler;
+
+    public DeleteItemNode() {
+        this.notImplementedHandler = () -> new NotImplementedHandler() {
+            @Override
+            public Object execute(Object arg, Object arg2) {
+                throw raise(TypeError, "'%p' object doesn't support item deletion", arg);
+            }
+        };
+    }
+
     public PNode getPrimary() {
         return getLeftNode();
     }
@@ -48,10 +64,15 @@ public PNode getSlice() {
 
     @Specialization
     public Object doObject(Object primary, Object slice,
-                    @Cached("create(__DELITEM__)") LookupAndCallBinaryNode callDelitemNode) {
+                    @Cached("createDelItemNode()") LookupAndCallBinaryNode callDelitemNode) {
         return callDelitemNode.executeObject(primary, slice);
     }
 
+    protected LookupAndCallBinaryNode createDelItemNode() {
+        return LookupAndCallBinaryNode.create(SpecialMethodNames.__DELITEM__, null, notImplementedHandler);
+
+    }
+
     public static DeleteItemNode create() {
         return DeleteItemNodeGen.create(null, null);
     }