[GR-25191] [GR-25747] Directly access valist when parsing arguments.

PullRequest: graalpython/1225

Author: fangerer

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -70,12 +70,18 @@ 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);
+    va_list args;
+    va_start(args, format);
+    PyObject* result = PyTruffle_Unicode_FromFormat(format, args);
+    va_end(args);
     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);
+    va_list args;
+    va_start(args, format);
+    PyObject* result = PyTruffle_Unicode_FromFormat(format, args);
+    va_end(args);
     return warn_unicode(PyExc_ResourceWarning, result, stack_level, source);
 }
 

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

@@ -199,7 +199,7 @@ initialize_type(_PyWeakref_CallableProxyType, CallableProxyType, PyWeakReference
 
 POLYGLOT_DECLARE_TYPE(PyThreadState);
 POLYGLOT_DECLARE_TYPE(newfunc);
-POLYGLOT_DECLARE_TYPE(uint32_t);
+
 
 static void initialize_globals() {
     // register native NULL
@@ -349,6 +349,7 @@ polyglot_typeid get_byte_array_typeid(uint64_t len) {
     return polyglot_array_typeid(polyglot_i8_typeid(), len);
 }
 
+POLYGLOT_DECLARE_TYPE(uint32_t);
 /** to be used from Java code only; returns the type ID for a uint32_t array */
 polyglot_typeid get_uint32_t_array_typeid(uint64_t len) {
     return polyglot_array_typeid(polyglot_uint32_t_typeid(), len);
@@ -701,8 +702,6 @@ int PyTruffle_Debug(void *arg) {
     return 0;
 }
 
-#define ARG(__n) ((PyObject*)polyglot_get_arg((__n)))
-
 int truffle_ptr_compare(void* x, void* y, int op) {
     switch (op) {
     case Py_LT:

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

@@ -379,8 +379,7 @@ 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);
 
 /* BYTES, BYTEARRAY */
 int bytes_buffer_getbuffer(PyBytesObject *self, Py_buffer *view, int flags);
@@ -392,38 +391,6 @@ 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, ...)          \
-    va_list __poly_args;                                                \
-    va_start(__poly_args, last);                                        \
-    result = function(__VA_ARGS__, __poly_args, NULL, 0);               \
-    va_end(__poly_args)
-#endif
-
 typedef PyObject* PyObjectPtr;
 POLYGLOT_DECLARE_TYPE(PyObjectPtr);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -161,7 +161,10 @@ 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);
+    va_list args;
+    va_start(args, fmt);
+    PyObject* formatted_msg = PyTruffle_Unicode_FromFormat(fmt, args);
+    va_end(args);
     UPCALL_CEXT_VOID(_jls_PyErr_CreateAndSetException, native_to_java(exception), native_to_java(formatted_msg));
     return NULL;
 }