update CallWithPolyglotArgs macro to use va_list always

Author: timfel

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

@@ -70,12 +70,12 @@ int PyErr_WarnEx(PyObject *category, const char *text, Py_ssize_t stack_level) {
 }
 
 NO_INLINE int PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level, const char *format, ...) {
-    CallWithPolyglotArgs(PyObject* result, format, 3, PyTruffle_Unicode_FromFormat, format);
+    CallWithPolyglotArgs(PyObject* result, format, PyTruffle_Unicode_FromFormat, format);
     return warn_unicode(category, result, stack_level, Py_None);
 }
 
 int PyErr_ResourceWarning(PyObject *source, Py_ssize_t stack_level, const char *format, ...) {
-    CallWithPolyglotArgs(PyObject* result, format, 3, PyTruffle_Unicode_FromFormat, format);
+    CallWithPolyglotArgs(PyObject* result, format, PyTruffle_Unicode_FromFormat, format);
     return warn_unicode(PyExc_ResourceWarning, result, stack_level, source);
 }
 

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

@@ -379,8 +379,8 @@ extern PyObject* wrapped_null;
 /* internal functions to avoid unnecessary managed <-> native conversions */
 
 /* 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);
+__attribute__((always_inline)) PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va);
+__attribute__((always_inline)) PyObject* PyTruffle_Tuple_Pack(int dummy, va_list va);
 
 /* BYTES, BYTEARRAY */
 int bytes_buffer_getbuffer(PyBytesObject *self, Py_buffer *view, int flags);
@@ -392,37 +392,11 @@ int bytes_copy2mem(char* target, char* source, size_t nbytes);
 /* MEMORYVIEW, BUFFERDECORATOR */
 int bufferdecorator_getbuffer(PyBufferDecorator *self, Py_buffer *view, int flags);
 
-#if 1
-/*
- * (tfel): On native Sulong, using va_list will force all arguments to native
- * memory, which hinders escape analysis and PE in a big way. To avoid this,
- * when we have function called with var args (rather than already with a
- * va_list), we allocate a managed array of void*, fill it with the arguments,
- * and pass that one on. In the target functions, we use the macros below to
- * access the variable arguments part depending on whether it is a va_list or a
- * managed void* array. The assumption is that once everything is compiled
- * together, the managed array with arguments will be escape analyzed away.
- */
-#define CallWithPolyglotArgs(result, last, off, function, ...)          \
-    va_list __va_list;                                                  \
-    int __poly_argc = polyglot_get_arg_count();                         \
-    int __poly_args_s = sizeof(void*) * (__poly_argc - off);            \
-    void **__poly_args = truffle_managed_malloc(__poly_args_s);         \
-    for (int i = off; i < __poly_argc; i++) {                           \
-        __poly_args[i - off] = polyglot_get_arg(i);                     \
-    }                                                                   \
-    result = function(__VA_ARGS__, __va_list, __poly_args, __poly_argc)
-#else
-/*
- * (tfel): Just skip the optimization with using a managed malloc and use
- * va_list always.
- */
-#define CallWithPolyglotArgs(result, last, off, function, ...)          \
+#define CallWithPolyglotArgs(result, last, function, ...)               \
     va_list __poly_args;                                                \
     va_start(__poly_args, last);                                        \
-    result = function(__VA_ARGS__, __poly_args, NULL, 0);               \
+    result = function(__VA_ARGS__, __poly_args);                        \
     va_end(__poly_args)
-#endif
 
 typedef PyObject* PyObjectPtr;
 POLYGLOT_DECLARE_TYPE(PyObjectPtr);

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

@@ -161,7 +161,7 @@ int PyErr_ExceptionMatches(PyObject *exc) {
 
 NO_INLINE
 PyObject* PyErr_Format(PyObject* exception, const char* fmt, ...) {
-    CallWithPolyglotArgs(PyObject* formatted_msg, fmt, 2, PyTruffle_Unicode_FromFormat, fmt);
+    CallWithPolyglotArgs(PyObject* formatted_msg, fmt, PyTruffle_Unicode_FromFormat, fmt);
     UPCALL_CEXT_VOID(_jls_PyErr_CreateAndSetException, native_to_java(exception), native_to_java(formatted_msg));
     return NULL;
 }

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

@@ -273,7 +273,7 @@ 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 argc) {
+MUST_INLINE static PyObject* _PyTruffle_BuildValue(const char* format, va_list va) {
     PyObject* (*converter)(void*) = NULL;
     int offset = 0;
     char argchar[2] = {'\0'};
@@ -482,18 +482,18 @@ PyObject* Py_VaBuildValue(const char *format, va_list va) {
 }
 
 PyObject* _Py_VaBuildValue_SizeT(const char *format, va_list va) {
-    return _PyTruffle_BuildValue(format, va, NULL, 0);
+    return _PyTruffle_BuildValue(format, va);
 }
 
 NO_INLINE
 PyObject* Py_BuildValue(const char *format, ...) {
-    CallWithPolyglotArgs(PyObject* result, format, 1, _PyTruffle_BuildValue, format);
+    CallWithPolyglotArgs(PyObject* result, format, _PyTruffle_BuildValue, format);
     return result;
 }
 
 NO_INLINE
 PyObject* _Py_BuildValue_SizeT(const char *format, ...) {
-    CallWithPolyglotArgs(PyObject* result, format, 1, _PyTruffle_BuildValue, format);
+    CallWithPolyglotArgs(PyObject* result, format, _PyTruffle_BuildValue, format);
     return result;
 }
 

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

@@ -255,7 +255,7 @@ PyObject* PyObject_CallMethod(PyObject* object, const char* method, const char*
 NO_INLINE
 PyObject* PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) {
     PyObject* args;
-	CallWithPolyglotArgs(args, name, 2, PyTruffle_Tuple_Pack, 0);
+    CallWithPolyglotArgs(args, name, PyTruffle_Tuple_Pack, 0);
     return UPCALL_CEXT_O(_jls_PyObject_CallMethod, native_to_java(callable), native_to_java(name), native_to_java(args));
 }
 

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

@@ -90,7 +90,7 @@ PyObject* PyTuple_Pack(Py_ssize_t n, ...) {
 }
 
 MUST_INLINE
-PyObject* PyTruffle_Tuple_Pack(int dummy, va_list vlist, void **argv, int argc) {
+PyObject* PyTruffle_Tuple_Pack(int dummy, va_list vlist) {
     PyObject *result = PyTuple_New(argc);
     for (int i = 0; i < argc; i++) {
         PyObject *o = (PyObject*) argv[i];

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

@@ -230,7 +230,7 @@ PyObject * PyUnicode_FromStringAndSize(const char *u, Py_ssize_t size) {
 
 #define AS_I64(__arg__) (polyglot_fits_in_i64((__arg__)) ? polyglot_as_i64((__arg__)) : (int64_t)(__arg__))
 
-MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va, void **args, int argc) {
+MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va) {
     size_t fmt_size = strlen(fmt) + 1;
     char* fmtcpy = strdup(fmt);
     char* c = fmtcpy;
@@ -320,12 +320,12 @@ MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va,
 }
 
 PyObject* PyUnicode_FromFormatV(const char* format, va_list va) {
-    return PyTruffle_Unicode_FromFormat(format, va, NULL, 0);
+    return PyTruffle_Unicode_FromFormat(format, va);
 }
 
 NO_INLINE
 PyObject* PyUnicode_FromFormat(const char* format, ...) {
-    CallWithPolyglotArgs(PyObject* result, format, 1, PyTruffle_Unicode_FromFormat, format);
+    CallWithPolyglotArgs(PyObject* result, format, PyTruffle_Unicode_FromFormat, format);
     return result;
 }