[GR-38978] Update HPy import (release 0.0.4).

fangerer · fangerer · commit 43ce4854c223 · 2022-06-02T13:18:22.000Z
PullRequest: graalpython/2291
diff --git a/graalpython/com.oracle.graal.python.cext/include/hpy/cpython/autogen_api_impl.h b/graalpython/com.oracle.graal.python.cext/include/hpy/cpython/autogen_api_impl.h
@@ -593,13 +593,13 @@ HPyAPI_FUNC HPy HPyImport_ImportModule(HPyContext *ctx, const char *name)
     return _py2h(PyImport_ImportModule(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());
 }
 
diff --git a/graalpython/com.oracle.graal.python.cext/include/hpy/hpymodule.h b/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);                     \
diff --git a/graalpython/com.oracle.graal.python.cext/include/hpy/inline_helpers.h b/graalpython/com.oracle.graal.python.cext/include/hpy/inline_helpers.h
@@ -41,6 +41,10 @@
 #ifndef HPY_INLINE_HELPERS_H
 #define HPY_INLINE_HELPERS_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);
@@ -51,4 +55,24 @@ HPyAPI_FUNC HPy HPyErr_SetFromErrnoWithFilenameObject(HPyContext *ctx, HPy h_typ
     return HPyErr_SetFromErrnoWithFilenameObjects(ctx, h_type, filename, HPy_NULL);
 }
 
+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
diff --git a/graalpython/com.oracle.graal.python.cext/include/hpy/macros.h b/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,
diff --git a/graalpython/com.oracle.graal.python.cext/include/hpy/universal/autogen_ctx.h b/graalpython/com.oracle.graal.python.cext/include/hpy/universal/autogen_ctx.h
@@ -278,8 +278,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);
diff --git a/graalpython/com.oracle.graal.python.cext/include/hpy/universal/autogen_trampolines.h b/graalpython/com.oracle.graal.python.cext/include/hpy/universal/autogen_trampolines.h
@@ -648,14 +648,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) ); 
 }
diff --git a/graalpython/com.oracle.graal.python.cext/include/hpy/version.h b/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.dev216+gf941e8f"
-#define HPY_GIT_REVISION "f941e8f"
+#define HPY_VERSION "0.0.4"
+#define HPY_GIT_REVISION "41989b8"
diff --git a/graalpython/com.oracle.graal.python.jni/src/ctx_tracker.c b/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;
diff --git a/graalpython/lib-graalpython/modules/hpy.egg-info/PKG-INFO b/graalpython/lib-graalpython/modules/hpy.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpy
-Version: 0.0.4.dev216+gf941e8f
+Version: 0.0.4
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN
diff --git a/graalpython/lib-graalpython/modules/hpy/debug/__init__.py b/graalpython/lib-graalpython/modules/hpy/debug/__init__.py
@@ -1,6 +1,6 @@
 # MIT License
 # 
-# Copyright (c) 2021, Oracle and/or its affiliates.
+# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
 # Copyright (c) 2019 pyhandle
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,3 +22,13 @@
 # SOFTWARE.
 
 from .leakdetector import HPyDebugError, HPyLeakError, LeakDetector
+
+
+def set_handle_stack_trace_limit(limit):
+    from hpy.universal import _debug
+    _debug.set_handle_stack_trace_limit(limit)
+
+
+def disable_handle_stack_traces():
+    from hpy.universal import _debug
+    _debug.set_handle_stack_trace_limit(None)
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/__init__.py b/graalpython/lib-graalpython/modules/hpy/devel/__init__.py
@@ -199,17 +199,26 @@ def handle_hpy_ext_modules(dist, attr, hpy_ext_modules):
 
 def __bootstrap__():
 
-    import sys, pkg_resources
+    from sys import modules
+    from os import environ
+    from pkg_resources import resource_filename
     from hpy.universal import load
-    ext_filepath = pkg_resources.resource_filename(__name__, {ext_file!r})
-    m = load({module_name!r}, ext_filepath)
+    env_debug = environ.get('HPY_DEBUG')
+    is_debug = env_debug is not None and (env_debug == "1" or __name__ in env_debug.split(","))
+    ext_filepath = resource_filename(__name__, {ext_file!r})
+    if 'HPY_LOG' in environ:
+        if is_debug:
+            print("Loading {module_name!r} in HPy universal mode with a debug context")
+        else:
+            print("Loading {module_name!r} in HPy universal mode")
+    m = load({module_name!r}, ext_filepath, debug=is_debug)
     m.__file__ = ext_filepath
     m.__loader__ = __loader__
     m.__name__ = __name__
     m.__package__ = __package__
     m.__spec__ = __spec__
     m.__spec__.origin = ext_filepath
-    sys.modules[__name__] = m
+    modules[__name__] = m
 
 __bootstrap__()
 """
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/argparse.c b/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/argparse.c
@@ -25,6 +25,10 @@
 /**
  * Implementation of HPyArg_Parse and HPyArg_ParseKeywords.
  *
+ * Note: those functions are runtime helper functions, i.e., they are not part
+ * of the HPy context, but are available to HPy extensions to incorporate at
+ * compile time.
+ *
  * HPyArg_Parse parses positional arguments and replaces PyArg_ParseTuple.
  * HPyArg_ParseKeywords parses positional and keyword arguments and
  * replaces PyArg_ParseTupleAndKeywords.
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/buildvalue.c b/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/buildvalue.c
@@ -41,6 +41,10 @@
 /**
  * Implementation of HPy_BuildValue.
  *
+ * Note: HPy_BuildValue is a runtime helper functions, i.e., it is not a part
+ * of the HPy context, but is available to HPy extensions to incorporate at
+ * compile time.
+ *
  * HPy_BuildValue creates a new value based on a format string from the values
  * passed in variadic arguments. Returns HPy_NULL in case of an error and raises
  * an exception.
@@ -91,7 +95,7 @@
  *     Convert a C double to a Python floating point number.
  *
  * Collections
- * ~~~~~~~
+ * ~~~~~~~~~~~
  *
  * ``(items) (tuple) [matching-items]``
  *     Convert a sequence of C values to a Python tuple with the same number of items.
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_module.c b/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_module.c
@@ -43,7 +43,7 @@ ctx_Module_Create(HPyContext *ctx, HPyModuleDef *hpydef)
     // we can't free this memory because it is stitched into moduleobject. We
     // just make it immortal for now, eventually we should think whether or
     // not to free it if/when we unload the module
-    PyModuleDef *def = PyMem_Malloc(sizeof(PyModuleDef));
+    PyModuleDef *def = (PyModuleDef*)PyMem_Malloc(sizeof(PyModuleDef));
     if (def == NULL) {
         PyErr_NoMemory();
         return HPy_NULL;
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_tracker.c b/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_tracker.c
@@ -113,12 +113,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);
@@ -146,7 +146,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;
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_type.c b/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_type.c
@@ -82,7 +82,7 @@ static HPyType_Extra_t *_HPyType_Extra_Alloc(const char *name, bool is_pure)
 {
     size_t name_size = strlen(name) + 1;
     size_t size = offsetof(HPyType_Extra_t, name) + name_size;
-    HPyType_Extra_t *result = PyMem_Calloc(1, size);
+    HPyType_Extra_t *result = (HPyType_Extra_t*)PyMem_Calloc(1, size);
     if (result == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -272,7 +272,7 @@ create_method_defs(HPyDef *hpydefs[], PyMethodDef *legacy_methods)
     HPy_ssize_t total_count = hpymeth_count + legacy_count;
 
     // allocate&fill the result
-    PyMethodDef *result = PyMem_Calloc(total_count+1, sizeof(PyMethodDef));
+    PyMethodDef *result = (PyMethodDef*)PyMem_Calloc(total_count+1, sizeof(PyMethodDef));
     if (result == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -319,7 +319,7 @@ create_member_defs(HPyDef *hpydefs[], PyMemberDef *legacy_members, HPy_ssize_t b
     HPy_ssize_t total_count = hpymember_count + legacy_count;
 
     // allocate&fill the result
-    PyMemberDef *result = PyMem_Calloc(total_count+1, sizeof(PyMemberDef));
+    PyMemberDef *result = (PyMemberDef*)PyMem_Calloc(total_count+1, sizeof(PyMemberDef));
     if (result == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -366,7 +366,7 @@ create_getset_defs(HPyDef *hpydefs[], PyGetSetDef *legacy_getsets)
     HPy_ssize_t total_count = hpygetset_count + legacy_count;
 
     // allocate&fill the result
-    PyGetSetDef *result = PyMem_Calloc(total_count+1, sizeof(PyGetSetDef));
+    PyGetSetDef *result = (PyGetSetDef*)PyMem_Calloc(total_count+1, sizeof(PyGetSetDef));
     if (result == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -407,7 +407,7 @@ create_slot_defs(HPyType_Spec *hpyspec, HPy_ssize_t base_member_offset,
     PyMethodDef *legacy_method_defs = NULL;
     PyMemberDef *legacy_member_defs = NULL;
     PyGetSetDef *legacy_getset_defs = NULL;
-    legacy_slots_count(hpyspec->legacy_slots, &legacy_slot_count,
+    legacy_slots_count((PyType_Slot*)hpyspec->legacy_slots, &legacy_slot_count,
                        &legacy_method_defs, &legacy_member_defs,
                        &legacy_getset_defs);
     bool needs_dealloc = needs_hpytype_dealloc(hpyspec);
@@ -424,7 +424,7 @@ create_slot_defs(HPyType_Spec *hpyspec, HPy_ssize_t base_member_offset,
 
     // allocate the result PyType_Slot array
     HPy_ssize_t total_slot_count = hpyslot_count + legacy_slot_count;
-    PyType_Slot *result = PyMem_Calloc(total_slot_count+1, sizeof(PyType_Slot));
+    PyType_Slot *result = (PyType_Slot*)PyMem_Calloc(total_slot_count+1, sizeof(PyType_Slot));
     if (result == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -447,7 +447,7 @@ create_slot_defs(HPyType_Spec *hpyspec, HPy_ssize_t base_member_offset,
             }
             PyType_Slot *dst = &result[dst_idx++];
             dst->slot = hpy_slot_to_cpy_slot(src->slot.slot);
-            dst->pfunc = src->slot.cpy_trampoline;
+            dst->pfunc = (void*)src->slot.cpy_trampoline;
         }
     }
 
@@ -498,12 +498,12 @@ create_slot_defs(HPyType_Spec *hpyspec, HPy_ssize_t base_member_offset,
 
     // add a dealloc function, if needed
     if (needs_dealloc) {
-        result[dst_idx++] = (PyType_Slot){Py_tp_dealloc, hpytype_dealloc};
+        result[dst_idx++] = (PyType_Slot){Py_tp_dealloc, (void*)hpytype_dealloc};
     }
 
     // add a tp_clear, if the user provided a tp_traverse
     if (has_tp_traverse(hpyspec)) {
-        result[dst_idx++] = (PyType_Slot){Py_tp_clear, hpytype_clear};
+        result[dst_idx++] = (PyType_Slot){Py_tp_clear, (void*)hpytype_clear};
     }
 
     // add the NULL sentinel at the end
@@ -529,7 +529,7 @@ create_buffer_procs(HPyType_Spec *hpyspec)
             switch (src->slot.slot) {
                 case HPy_bf_getbuffer:
                     if (buffer_procs == NULL) {
-                        buffer_procs = PyMem_Calloc(1, sizeof(PyBufferProcs));
+                        buffer_procs = (PyBufferProcs*)PyMem_Calloc(1, sizeof(PyBufferProcs));
                         if (buffer_procs == NULL) {
                             PyErr_NoMemory();
                             return NULL;
@@ -539,7 +539,7 @@ create_buffer_procs(HPyType_Spec *hpyspec)
                     break;
                 case HPy_bf_releasebuffer:
                     if (buffer_procs == NULL) {
-                        buffer_procs = PyMem_Calloc(1, sizeof(PyBufferProcs));
+                        buffer_procs = (PyBufferProcs*)PyMem_Calloc(1, sizeof(PyBufferProcs));
                         if (buffer_procs == NULL) {
                             PyErr_NoMemory();
                             return NULL;
@@ -730,7 +730,7 @@ ctx_Type_FromSpec(HPyContext *ctx, HPyType_Spec *hpyspec,
         return HPy_NULL;
     }
 
-    PyType_Spec *spec = PyMem_Calloc(1, sizeof(PyType_Spec));
+    PyType_Spec *spec = (PyType_Spec*)PyMem_Calloc(1, sizeof(PyType_Spec));
     if (spec == NULL) {
         PyErr_NoMemory();
         return HPy_NULL;
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/version.py b/graalpython/lib-graalpython/modules/hpy/devel/version.py
@@ -22,5 +22,5 @@
 # SOFTWARE.
 
 # automatically generated by setup.py:get_scm_config()
-__version__ = "0.0.4.dev216+gf941e8f"
-__git_revision__ = "f941e8f"
+__version__ = "0.0.4"
+__git_revision__ = "41989b8"
diff --git a/graalpython/lib-graalpython/modules/hpy/test/debug/test_handles_leak.py b/graalpython/lib-graalpython/modules/hpy/test/debug/test_handles_leak.py
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_00_basic.py b/graalpython/lib-graalpython/modules/hpy/test/test_00_basic.py
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_cpy_compat.py b/graalpython/lib-graalpython/modules/hpy/test/test_cpy_compat.py
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_helpers.py b/graalpython/lib-graalpython/modules/hpy/test/test_helpers.py
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_hpytype.py b/graalpython/lib-graalpython/modules/hpy/test/test_hpytype.py
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_hpytype_legacy.py b/graalpython/lib-graalpython/modules/hpy/test/test_hpytype_legacy.py
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_slots.py b/graalpython/lib-graalpython/modules/hpy/test/test_slots.py
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_slots_legacy.py b/graalpython/lib-graalpython/modules/hpy/test/test_slots_legacy.py

Original file line number	Diff line number	Diff line change
`@@ -593,13 +593,13 @@ HPyAPI_FUNC HPy HPyImport_ImportModule(HPyContext ctx, const char name)`
`593`	`593`	`return _py2h(PyImport_ImportModule(name));`
`594`	`594`	`}`
`595`	`595`
`596`		`-HPyAPI_FUNC HPyThreadState HPy_LeavePythonExecution(HPyContext *ctx)`
	`596`	`+HPyAPI_FUNC void HPy_ReenterPythonExecution(HPyContext *ctx, HPyThreadState state)`
`597`	`597`	`{`
`598`		`- return _threads2h(PyEval_SaveThread());`
	`598`	`+ PyEval_RestoreThread(_h2threads(state));`
`599`	`599`	`}`
`600`	`600`
`601`		`-HPyAPI_FUNC void HPy_ReenterPythonExecution(HPyContext *ctx, HPyThreadState state)`
	`601`	`+HPyAPI_FUNC HPyThreadState HPy_LeavePythonExecution(HPyContext *ctx)`
`602`	`602`	`{`
`603`		`- PyEval_RestoreThread(_h2threads(state));`
	`603`	`+ return _threads2h(PyEval_SaveThread());`
`604`	`604`	`}`
`605`	`605`
Original file line number	Diff line number	Diff line change
`@@ -648,14 +648,14 @@ HPyAPI_FUNC HPy HPyField_Load(HPyContext *ctx, HPy source_object, HPyField sourc`
`648`	`648`	`return WRAP(ctx->ctx_Field_Load ( ctx, UNWRAP(source_object), UNWRAP_FIELD(source_field) ));`
`649`	`649`	`}`
`650`	`650`
`651`		`-HPyAPI_FUNC HPyThreadState HPy_LeavePythonExecution(HPyContext *ctx) {`
`652`		`- return WRAP_THREADSTATE(ctx->ctx_LeavePythonExecution ( ctx ));`
`653`		`-}`
`654`		`-`
`655`	`651`	`HPyAPI_FUNC void HPy_ReenterPythonExecution(HPyContext *ctx, HPyThreadState state) {`
`656`	`652`	`ctx->ctx_ReenterPythonExecution ( ctx, UNWRAP_THREADSTATE(state) );`
`657`	`653`	`}`
`658`	`654`
	`655`	`+HPyAPI_FUNC HPyThreadState HPy_LeavePythonExecution(HPyContext *ctx) {`
	`656`	`+ return WRAP_THREADSTATE(ctx->ctx_LeavePythonExecution ( ctx ));`
	`657`	`+}`
	`658`	`+`
`659`	`659`	`HPyAPI_FUNC void HPyGlobal_Store(HPyContext ctx, HPyGlobal global, HPy h) {`
`660`	`660`	`ctx->ctx_Global_Store ( ctx, global, UNWRAP(h) );`
`661`	`661`	`}`