[GR-17674] Avoid platform-specific code in C API.

PullRequest: graalpython/619

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/pyconfig.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -41,6 +41,8 @@
 #ifndef Py_PYCONFIG_H
 #define Py_PYCONFIG_H
 
+// required for __UINT32_MAX__ etc.
+#include <limits.h>
 
 // defines based on Clang defines
 #define SIZEOF_DOUBLE __SIZEOF_DOUBLE__
@@ -60,13 +62,21 @@
 #define SIZEOF_VOID_P __SIZEOF_POINTER__
 #define SIZEOF_WCHAR_T __SIZEOF_WCHAR_T__
 #define SIZEOF__BOOL 1
-#define INT_MIN ((-__INT32_MAX__)-1)
-#define INT_MAX __INT32_MAX__
+# ifndef UINT_MAX
 #define UINT_MAX __UINT32_MAX__
+#endif
+# ifndef SHRT_MIN
 #define SHRT_MIN ((-__INT16_MAX__)-1)
+#endif
+# ifndef SHRT_MAX
 #define SHRT_MAX __INT16_MAX__
+#endif
+# ifndef USHRT_MAX
 #define USHRT_MAX __UINT16_MAX__
+#endif
+# ifndef CHAR_BIT
 #define CHAR_BIT __CHAR_BIT__
+#endif
 // #define Py_LIMITED_API 1
 #define _Py_BEGIN_SUPPRESS_IPH
 #define _Py_END_SUPPRESS_IPH

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

@@ -352,13 +352,14 @@ int bufferdecorator_getbuffer(PyBufferDecorator *self, Py_buffer *view, int flag
  * 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__, NULL, __poly_args, 0)
+    result = function(__VA_ARGS__, __va_list, __poly_args, 0)
 #else
 /*
  * (tfel): Just skip the optimization with using a managed malloc and use

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

@@ -120,6 +120,7 @@ MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va,
     char* fmtcpy = (char*) malloc(fmt_size*sizeof(char));
     memcpy(fmtcpy, fmt, fmt_size);
     char* c = fmtcpy;
+    int use_valist = args == NULL;
 
     int remaining_space = 2047;
     char* buffer = (char*)calloc(sizeof(char), remaining_space + 1);
@@ -140,7 +141,7 @@ MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va,
                     allocated = NULL;
                 }
                 variable = NULL;
-            } else if (va != NULL) {
+            } else if (use_valist) {
                 bytes_written = vsnprintf(buffer, remaining_space, fmtcpy, va);
             } else {
                 strncpy(buffer, fmtcpy, remaining_space);
@@ -165,7 +166,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(args == NULL ? va_arg(va, PyObject*) : (PyObject*)(args[argc++])));
+                allocated = variable = as_char_pointer(converter(use_valist ? va_arg(va, PyObject*) : (PyObject*)(args[argc++])));
                 break;
             case '%':
                 // literal %
@@ -192,7 +193,7 @@ MUST_INLINE PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va,
         if (allocated) {
             free(allocated);
         }
-    } else if (va != NULL) {
+    } else if (use_valist) {
         vsnprintf(buffer, remaining_space, fmtcpy, va);
     } else {
         strncpy(buffer, fmtcpy, remaining_space);