Merge branch 'master'

Author: fangerer

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "d90fe739f07cf57e6e8779e31b2ee6e3d543ed50" }
+{ "overlay": "29ac25e29ab69b45b98ba7c1ec9fac62e30c8cf2" }

graalpython/com.oracle.graal.python.cext/include/hpy/cpython/autogen_api_impl.h

@@ -656,14 +656,14 @@ HPyAPI_FUNC int HPyCapsule_IsValid(HPyContext *ctx, HPy capsule, const char *nam
     return PyCapsule_IsValid(_h2py(capsule), name);
 }
 
-HPyAPI_FUNC HPyThreadState HPy_LeavePythonExecution(HPyContext *ctx)
+HPyAPI_FUNC void HPy_ReenterPythonExecution(HPyContext *ctx, HPyThreadState state)
 {
-    return _threads2h(PyEval_SaveThread());
+    PyEval_RestoreThread(_h2threads(state));
 }
 
-HPyAPI_FUNC void HPy_ReenterPythonExecution(HPyContext *ctx, HPyThreadState state)
+HPyAPI_FUNC HPyThreadState HPy_LeavePythonExecution(HPyContext *ctx)
 {
-    PyEval_RestoreThread(_h2threads(state));
+    return _threads2h(PyEval_SaveThread());
 }
 
 HPyAPI_FUNC int HPyType_CheckSlot(HPyContext *ctx, HPy type, HPyDef *value)

graalpython/com.oracle.graal.python.cext/include/hpy/hpymodule.h

@@ -49,15 +49,20 @@ typedef struct {
 } HPyModuleDef;
 
 
+#if defined(__cplusplus)
+#  define HPyMODINIT_FUNC extern "C" Py_EXPORTED_SYMBOL HPy
+#else /* __cplusplus */
+#  define HPyMODINIT_FUNC Py_EXPORTED_SYMBOL HPy
+#endif /* __cplusplus */
 
 #ifdef HPY_UNIVERSAL_ABI
 
 // module initialization in the universal case
 #define HPy_MODINIT(modname)                                   \
     _HPy_HIDDEN HPyContext *_ctx_for_trampolines;              \
     static HPy init_##modname##_impl(HPyContext *ctx);         \
-    Py_EXPORTED_SYMBOL                                         \
-    HPy HPyInit_##modname(HPyContext *ctx)                     \
+    HPyMODINIT_FUNC                                         \
+    HPyInit_##modname(HPyContext *ctx)                     \
     {                                                          \
         _ctx_for_trampolines = ctx;                            \
         return init_##modname##_impl(ctx);                     \

graalpython/com.oracle.graal.python.cext/include/hpy/inline_helpers.h

@@ -43,6 +43,10 @@
 
 #include <assert.h>
 
+#if defined(_MSC_VER)
+# include <malloc.h>  /* for alloca() */
+#endif
+
 HPyAPI_FUNC HPy HPyErr_SetFromErrno(HPyContext *ctx, HPy h_type)
 {
     return HPyErr_SetFromErrnoWithFilenameObjects(ctx, h_type, HPy_NULL, HPy_NULL);
@@ -92,4 +96,24 @@ HPyAPI_FUNC int HPySlice_AdjustIndices(HPy_ssize_t length, HPy_ssize_t *start, H
     return 0;
 }
 
+HPyAPI_FUNC HPy HPyTuple_Pack(HPyContext *ctx, HPy_ssize_t n, ...) {
+    va_list vargs;
+    HPy_ssize_t i;
+
+    if (n == 0) {
+        return HPyTuple_FromArray(ctx, (HPy*)NULL, n);
+    }
+    HPy *array = (HPy *)alloca(n * sizeof(HPy));
+    va_start(vargs, n);
+    if (array == NULL) {
+        va_end(vargs);
+        return HPy_NULL;
+    }
+    for (i = 0; i < n; i++) {
+        array[i] = va_arg(vargs, HPy);
+    }
+    va_end(vargs);
+    return HPyTuple_FromArray(ctx, array, n);
+}
+
 #endif //HPY_INLINE_HELPERS_H

graalpython/com.oracle.graal.python.cext/include/hpy/macros.h

@@ -39,15 +39,6 @@
     ((void**)data)                                                            \
   ))
 
-
-/* ~~~ HPyTuple_Pack ~~~
-
-   this is just syntactic sugar around HPyTuple_FromArray, to help porting the
-   exising code which uses PyTuple_Pack
-*/
-
-#define HPyTuple_Pack(ctx, n, ...) (HPyTuple_FromArray(ctx, (HPy[]){ __VA_ARGS__ }, n))
-
 /* Rich comparison opcodes */
 typedef enum {
     HPy_LT = 0,

graalpython/com.oracle.graal.python.cext/include/hpy/universal/autogen_ctx.h

@@ -302,8 +302,8 @@ struct _HPyContext_s {
     void (*ctx_Tracker_Close)(HPyContext *ctx, HPyTracker ht);
     void (*ctx_Field_Store)(HPyContext *ctx, HPy target_object, _HPyFieldPtr target_field, HPy h);
     HPy (*ctx_Field_Load)(HPyContext *ctx, HPy source_object, HPyField source_field);
-    HPyThreadState (*ctx_LeavePythonExecution)(HPyContext *ctx);
     void (*ctx_ReenterPythonExecution)(HPyContext *ctx, HPyThreadState state);
+    HPyThreadState (*ctx_LeavePythonExecution)(HPyContext *ctx);
     void (*ctx_Global_Store)(HPyContext *ctx, _HPyGlobalPtr global, HPy h);
     HPy (*ctx_Global_Load)(HPyContext *ctx, HPyGlobal global);
     void (*ctx_Dump)(HPyContext *ctx, HPy h);

graalpython/com.oracle.graal.python.cext/include/hpy/universal/autogen_trampolines.h

@@ -724,14 +724,14 @@ HPyAPI_FUNC HPy HPyField_Load(HPyContext *ctx, HPy source_object, HPyField sourc
      return WRAP(ctx->ctx_Field_Load ( ctx, UNWRAP(source_object), UNWRAP_FIELD(source_field) )); 
 }
 
-HPyAPI_FUNC HPyThreadState HPy_LeavePythonExecution(HPyContext *ctx) {
-     return WRAP_THREADSTATE(ctx->ctx_LeavePythonExecution ( ctx )); 
-}
-
 HPyAPI_FUNC void HPy_ReenterPythonExecution(HPyContext *ctx, HPyThreadState state) {
      ctx->ctx_ReenterPythonExecution ( ctx, UNWRAP_THREADSTATE(state) ); 
 }
 
+HPyAPI_FUNC HPyThreadState HPy_LeavePythonExecution(HPyContext *ctx) {
+     return WRAP_THREADSTATE(ctx->ctx_LeavePythonExecution ( ctx )); 
+}
+
 HPyAPI_FUNC void HPyGlobal_Store(HPyContext *ctx, HPyGlobal *global, HPy h) {
      ctx->ctx_Global_Store ( ctx, global, UNWRAP(h) ); 
 }

graalpython/com.oracle.graal.python.cext/include/hpy/version.h

@@ -23,5 +23,5 @@
  */
 
 // automatically generated by setup.py:get_scm_config()
-#define HPY_VERSION "0.0.4.dev260+ge3eb9de"
-#define HPY_GIT_REVISION "e3eb9de"
+#define HPY_VERSION "0.0.4"
+#define HPY_GIT_REVISION "41989b8"

graalpython/com.oracle.graal.python.cext/lzma/config.h

@@ -71,7 +71,7 @@
 #define HAVE_FUTIMENS 1
 #define HAVE_GETTEXT 1
 #ifdef __aarch64__
-#define HAVE_IMMINTRIN_H 0
+#undef HAVE_IMMINTRIN_H
 #else
 #define HAVE_IMMINTRIN_H 1
 #endif

graalpython/com.oracle.graal.python.jni/src/ctx_tracker.c

@@ -109,12 +109,12 @@ ctx_Tracker_New(HPyContext *ctx, HPy_ssize_t capacity)
     }
     capacity++; // always reserve space for an extra handle, see the docs
 
-    hp = malloc(sizeof(_HPyTracker_s));
+    hp = (_HPyTracker_s*)malloc(sizeof(_HPyTracker_s));
     if (hp == NULL) {
         HPyErr_NoMemory(ctx);
         return _hp2ht(0);
     }
-    hp->handles = calloc(capacity, sizeof(HPy));
+    hp->handles = (HPy*)calloc(capacity, sizeof(HPy));
     if (hp->handles == NULL) {
         free(hp);
         HPyErr_NoMemory(ctx);
@@ -142,7 +142,7 @@ tracker_resize(HPyContext *ctx, _HPyTracker_s *hp, HPy_ssize_t capacity)
         HPyErr_SetString(ctx, ctx->h_ValueError, "HPyTracker resize would lose handles");
         return -1;
     }
-    new_handles = realloc(hp->handles, capacity * sizeof(HPy));
+    new_handles = (HPy*)realloc(hp->handles, capacity * sizeof(HPy));
     if (new_handles == NULL) {
         HPyErr_NoMemory(ctx);
         return -1;