Implement C API function PyObject_CallMethodObjArgs.

Author: fangerer

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

@@ -331,6 +331,7 @@ extern PyObject* wrapped_null;
 
 /* STR */
 __attribute__((always_inline)) PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va, void **args, int argc);
+__attribute__((always_inline)) PyObject* PyTruffle_Tuple_Pack(int dummy, va_list va, void **args, int argc);
 
 /* BYTES, BYTEARRAY */
 int bytes_buffer_getbuffer(PyBytesObject *self, Py_buffer *view, int flags);
@@ -361,7 +362,7 @@ int bufferdecorator_getbuffer(PyBufferDecorator *self, Py_buffer *view, int flag
     for (int i = off; i < __poly_argc; i++) {                           \
         __poly_args[i - off] = polyglot_get_arg(i);                     \
     }                                                                   \
-    result = function(__VA_ARGS__, __va_list, __poly_args, 0)
+    result = function(__VA_ARGS__, __va_list, __poly_args, __poly_argc)
 #else
 /*
  * (tfel): Just skip the optimization with using a managed malloc and use

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

@@ -102,8 +102,9 @@ PyObject* PyTruffle_GetArg(positional_argstack* p, PyObject* kwds, char** kwdnam
 
 /* argparse */
 UPCALL_ID(__bool__);
-MUST_INLINE static int _PyTruffleArg_ParseTupleAndKeywords(PyObject *argv, PyObject *kwds, const char *format, char **kwdnames, va_list va, void** poly_args, int offset) {
+MUST_INLINE static int _PyTruffleArg_ParseTupleAndKeywords(PyObject *argv, PyObject *kwds, const char *format, char **kwdnames, va_list va, void** poly_args, int argc) {
     PyObject* arg;
+    int offset = 0;
     int format_idx = 0;
     unsigned char rest_optional = 0;
     unsigned char rest_keywords_only = 0;
@@ -485,8 +486,9 @@ typedef struct _build_stack {
     struct _build_stack* prev;
 } build_stack;
 
-MUST_INLINE static PyObject* _PyTruffle_BuildValue(const char* format, va_list va, void** poly_args, int offset) {
+MUST_INLINE static PyObject* _PyTruffle_BuildValue(const char* format, va_list va, void** poly_args, int argc) {
     PyObject* (*converter)(void*) = NULL;
+    int offset = 0;
     char argchar[2] = {'\0'};
     unsigned int format_idx = 0;
     build_stack *v = (build_stack*)calloc(1, sizeof(build_stack));

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

@@ -274,6 +274,7 @@ PyObject* PyObject_CallFunctionObjArgs(PyObject *callable, ...) {
 }
 
 UPCALL_ID(PyObject_CallMethod);
+NO_INLINE
 PyObject* PyObject_CallMethod(PyObject* object, const char* method, const char* fmt, ...) {
     PyObject* args;
     if (fmt == NULL || fmt[0] == '\0') {
@@ -284,6 +285,14 @@ PyObject* PyObject_CallMethod(PyObject* object, const char* method, const char*
     return UPCALL_CEXT_O(_jls_PyObject_CallMethod, native_to_java(object), polyglot_from_string(method, SRC_CS), native_to_java(args));
 }
 
+NO_INLINE
+PyObject* PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) {
+    PyObject* args;
+	CallWithPolyglotArgs(args, name, 2, PyTruffle_Tuple_Pack, 0);
+    return UPCALL_CEXT_O(_jls_PyObject_CallMethod, native_to_java(callable), native_to_java(name), native_to_java(args));
+}
+
+NO_INLINE
 PyObject* _PyObject_CallMethod_SizeT(PyObject* object, const char* method, const char* fmt, ...) {
     PyObject* args;
     if (fmt == NULL || fmt[0] == '\0') {

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

@@ -85,6 +85,15 @@ PyObject* PyTuple_Pack(Py_ssize_t n, ...) {
     return result;
 }
 
+MUST_INLINE
+PyObject* PyTruffle_Tuple_Pack(int dummy, va_list vlist, void **argv, int argc) {
+    PyObject *result = PyTuple_New(argc);
+    for (int i = 0; i < argc; i++) {
+        PyTuple_SetItem(result, i, (PyObject*) argv[i]);
+    }
+    return result;
+}
+
 MUST_INLINE
 static PyObject * tuple_create(PyObject *iterable) {
     if (iterable == NULL) {

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

@@ -132,6 +132,7 @@ MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va,
     char* fmtcpy = strdup(fmt);
     char* c = fmtcpy;
     int use_valist = args == NULL;
+    int pos = 0;
 
     int remaining_space = 2047;
     char* buffer = (char*)calloc(sizeof(char), remaining_space + 1);
@@ -177,7 +178,7 @@ MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va,
             case 'R':
                 if (converter == NULL) converter = PyObject_Repr;
                 c[1] = 's';
-                allocated = variable = as_char_pointer(converter(use_valist ? va_arg(va, PyObject*) : (PyObject*)(args[argc++])));
+                allocated = variable = as_char_pointer(converter(use_valist ? va_arg(va, PyObject*) : (PyObject*)(args[pos++])));
                 break;
             case '%':
                 // literal %
@@ -189,7 +190,7 @@ MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va,
                 // if we're reading args from a void* array, read it now,
                 // otherwise there's nothing to do
                 if (args != NULL) {
-                    variable = args[argc++];
+                    variable = args[pos++];
                 }
             }
             // skip over next char, we checked it