Add mapping from __delitem__ to the mapping slot

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -331,6 +331,7 @@ void initialize_hashes();
 #define JWRAPPER_OBJOBJPROC                  39
 #define JWRAPPER_OBJOBJARGPROC               40
 #define JWRAPPER_NEW                         41
+#define JWRAPPER_MP_DELITEM                  42
 
 #define TDEBUG __builtin_debugtrap()
 #define get_method_flags_wrapper(flags)                                                  \

graalpython/com.oracle.graal.python.cext/src/typeobject.c

@@ -680,6 +680,7 @@ int PyType_Ready(PyTypeObject* cls) {
         ADD_SLOT_CONV("__len__", mappings->mp_length, -1, JWRAPPER_LENFUNC);
         ADD_SLOT_CONV("__getitem__", mappings->mp_subscript, -2, JWRAPPER_BINARYFUNC);
         ADD_SLOT_CONV("__setitem__", mappings->mp_ass_subscript, -3, JWRAPPER_OBJOBJARGPROC);
+        ADD_SLOT_CONV("__delitem__", mappings->mp_ass_subscript, -3, JWRAPPER_MP_DELITEM);
     }
 
     PyAsyncMethods* async = cls->tp_as_async;

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

@@ -214,7 +214,8 @@ public enum PExternalFunctionWrapper {
         LENFUNC(38, 0, AllToSulongNode::create, CheckPrimitiveFunctionResultNodeGen::create),
         OBJOBJPROC(39, 0, AllToSulongNode::create, CheckInquiryResultNodeGen::create),
         OBJOBJARGPROC(40, 0, AllToSulongNode::create, CheckPrimitiveFunctionResultNodeGen::create),
-        NEW(41);
+        NEW(41),
+        MP_DELITEM(42, 0, AllToSulongNode::create, CheckPrimitiveFunctionResultNodeGen::create);
 
         @CompilationFinal(dimensions = 1) private static final PExternalFunctionWrapper[] VALUES = Arrays.copyOf(values(), values().length);
 
@@ -379,6 +380,10 @@ static RootCallTarget getOrCreateCallTarget(PExternalFunctionWrapper sig, Python
                     nodeKlass = SetterRoot.class;
                     rootNodeFunction = l -> new SetterRoot(l, name, sig);
                     break;
+                case MP_DELITEM:
+                    nodeKlass = MpDelItemRootNode.class;
+                    rootNodeFunction = doArgAndResultConversion ? l -> new MpDelItemRootNode(l, name, sig) : l -> new MpDelItemRootNode(l, name);
+                    break;
                 default:
                     throw CompilerDirectives.shouldNotReachHere();
             }
@@ -1353,6 +1358,44 @@ public Signature getSignature() {
         }
     }
 
+    /**
+     * Implement mapping of {@code __delitem__} to {@code mp_ass_subscript}. It handles adding the
+     * NULL 3rd argument.
+     */
+    static final class MpDelItemRootNode extends MethodDescriptorRoot {
+        private static final Signature SIGNATURE = new Signature(-1, false, -1, false, new String[]{"self", "i"}, KEYWORDS_HIDDEN_CALLABLE, true);
+        @Child private ReadIndexedArgumentNode readArg1Node;
+
+        MpDelItemRootNode(PythonLanguage language, String name) {
+            super(language, name, false);
+        }
+
+        MpDelItemRootNode(PythonLanguage language, String name, PExternalFunctionWrapper provider) {
+            super(language, name, false, provider);
+            this.readArg1Node = ReadIndexedArgumentNode.create(1);
+        }
+
+        @Override
+        protected Object[] prepareCArguments(VirtualFrame frame) {
+            Object self = readSelf(frame);
+            Object arg1 = readArg1Node.execute(frame);
+            return new Object[]{self, arg1, PNone.NO_VALUE};
+        }
+
+        @Override
+        protected void postprocessCArguments(VirtualFrame frame, Object[] cArguments) {
+            ReleaseNativeWrapperNode releaseNativeWrapperNode = ensureReleaseNativeWrapperNode();
+            releaseNativeWrapperNode.execute(cArguments[0]);
+            releaseNativeWrapperNode.execute(cArguments[1]);
+            releaseNativeWrapperNode.execute(cArguments[2]);
+        }
+
+        @Override
+        public Signature getSignature() {
+            return SIGNATURE;
+        }
+    }
+
     /**
      * Wrapper root node for reverse binary operations.
      */