[GR-24538] Raise TypeError on missing argument in PyArg_ParseTuple*

PullRequest: graalpython/1337

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_modsupport.py

@@ -54,6 +54,16 @@ def _reference_typecheck(args, expected_type):
     return args[0][0]
 
 
+def _reference_parse_O(args):
+    assert isinstance(args[0], tuple)
+    assert isinstance(args[1], dict)
+    if args[0]:
+        return args[0][0]
+    elif "arg0" in args[1]:
+        return args[1]["arg0"]
+    raise TypeError
+
+
 class Indexable:
     def __int__(self):
         return 456
@@ -107,6 +117,32 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+    test_parseargs_O = CPyExtFunction(
+        _reference_parse_O,
+        lambda: (
+            (('helloworld', ), dict()),
+            (tuple(), {"arg0": 'helloworld'}),
+            (tuple(), dict()),
+            (tuple(), {"arg1": 'helloworld'}),
+        ),
+        code='''
+        static PyObject* wrap_PyArg_ParseTupleAndKeywords(PyObject* argTuple, PyObject* kwargs) {
+            PyObject* out = NULL;
+            static char *kwdnames[] = {"arg0", NULL};
+            if (PyArg_ParseTupleAndKeywords(argTuple, kwargs, "O", kwdnames, &out) == 0) {
+                return NULL;
+            }
+            Py_XINCREF(out);
+            return out;
+        }
+        ''',
+        resultspec="O",
+        argspec="OO",
+        arguments=["PyObject* argTuple", "PyObject* kwargs"],
+        callfunction="wrap_PyArg_ParseTupleAndKeywords",
+        cmpfunc=unhandled_error_compare
+    )
+
     test_parseargs_O_conv = CPyExtFunction(
         lambda args: True if args[0][0] else False,
         lambda: (

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtParseArgumentsNode.java

@@ -1021,14 +1021,19 @@ abstract static class GetArgNode extends Node {
         static Object doNoKeywords(ParserState state, Object kwds, Object kwdnames, boolean keywordsOnly,
                         @Shared("lenNode") @Cached SequenceNodes.LenNode lenNode,
                         @Shared("getSequenceStorageNode") @Cached GetSequenceStorageNode getSequenceStorageNode,
-                        @Shared("getItemNode") @Cached SequenceStorageNodes.GetItemDynamicNode getItemNode) {
+                        @Shared("getItemNode") @Cached SequenceStorageNodes.GetItemDynamicNode getItemNode,
+                        @Shared("raiseNode") @Cached PRaiseNativeNode raiseNode) {
 
             Object out = null;
             assert !keywordsOnly;
             int l = lenNode.execute(state.v.argv);
             if (state.v.argnum < l) {
                 out = getItemNode.execute(getSequenceStorageNode.execute(state.v.argv), state.v.argnum);
             }
+            if (out == null && !state.restOptional) {
+                raiseNode.raiseIntWithoutFrame(0, TypeError, "%s missing required argument (pos %d)", state.funName, state.v.argnum);
+                throw ParseArgumentsException.raise();
+            }
             state.v.argnum++;
             return out;
         }
@@ -1041,7 +1046,8 @@ static Object doGeneric(ParserState state, Object kwds, Object kwdnames, boolean
                         @Cached HashingCollectionNodes.GetDictStorageNode getDictStorageNode,
                         @CachedLibrary(limit = "1") InteropLibrary kwdnamesLib,
                         @CachedLibrary(limit = "1") HashingStorageLibrary lib,
-                        @Cached PCallCExtFunction callCStringToString) throws InteropException {
+                        @Cached PCallCExtFunction callCStringToString,
+                        @Shared("raiseNode") @Cached PRaiseNativeNode raiseNode) throws InteropException {
 
             Object out = null;
             if (!keywordsOnly) {
@@ -1062,6 +1068,10 @@ static Object doGeneric(ParserState state, Object kwds, Object kwdnames, boolean
                     out = lib.getItem(getDictStorageNode.execute((PDict) kwds), kwdname);
                 }
             }
+            if (out == null && !state.restOptional) {
+                raiseNode.raiseIntWithoutFrame(0, TypeError, "%s missing required argument (pos %d)", state.funName, state.v.argnum);
+                throw ParseArgumentsException.raise();
+            }
             state.v.argnum++;
             return out;
         }