Update HPy inlined files: f941e8f

Author: timfel

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

@@ -41,10 +41,12 @@ extern "C" {
 #  define _hconv(h) {h}
 #  define _hfconv(h) {h}
 #  define _htsconv(h) {h}
+#  define _hgconv(h) {h}
 #else
 #  define _hconv(h) ((HPy){h})
 #  define _hfconv(h) ((HPyField){h})
 #  define _htsconv(h) ((HPyThreadState){h})
+#  define _hgconv(h) ((HPyGlobal){h})
 #endif
 /* ~~~~~~~~~~~~~~~~ HPyAPI declaration ~~~~~~~~~~~~~~~~ */
 
@@ -109,6 +111,7 @@ extern "C" {
  */
 typedef struct _HPy_s { intptr_t _i; } HPy;
 typedef struct { intptr_t _i; } HPyField;
+typedef struct { intptr_t _i; } HPyGlobal;
 typedef struct { intptr_t _lst; } HPyListBuilder;
 typedef struct { intptr_t _tup; } HPyTupleBuilder;
 typedef struct { intptr_t _i; } HPyTracker;

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

@@ -80,6 +80,16 @@ HPyAPI_FUNC HPy_ssize_t HPyLong_AsSsize_t(HPyContext *ctx, HPy h)
     return PyLong_AsSsize_t(_h2py(h));
 }
 
+HPyAPI_FUNC void *HPyLong_AsVoidPtr(HPyContext *ctx, HPy h)
+{
+    return PyLong_AsVoidPtr(_h2py(h));
+}
+
+HPyAPI_FUNC double HPyLong_AsDouble(HPyContext *ctx, HPy h)
+{
+    return PyLong_AsDouble(_h2py(h));
+}
+
 HPyAPI_FUNC HPy HPyFloat_FromDouble(HPyContext *ctx, double v)
 {
     return _py2h(PyFloat_FromDouble(v));
@@ -334,6 +344,11 @@ HPyAPI_FUNC int HPyErr_WarnEx(HPyContext *ctx, HPy category, const char *message
     return PyErr_WarnEx(_h2py(category), message, stack_level);
 }
 
+HPyAPI_FUNC void HPyErr_WriteUnraisable(HPyContext *ctx, HPy obj)
+{
+    PyErr_WriteUnraisable(_h2py(obj));
+}
+
 HPyAPI_FUNC int HPy_IsTrue(HPyContext *ctx, HPy h)
 {
     return PyObject_IsTrue(_h2py(h));

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

@@ -33,6 +33,18 @@ static inline PyObject * _hf2py(HPyField hf)
     return _h2py(h);
 }
 
+static inline HPyGlobal _py2hg(PyObject *obj)
+{
+    HPy h = _py2h(obj);
+    return _hgconv(._i = h._i);
+}
+
+static inline PyObject * _hg2py(HPyGlobal hf)
+{
+    HPy h = { ._i = hf._i };
+    return _h2py(h);
+}
+
 // this should maybe autogenerated from public_api.h
 struct _HPyContext_s {
     const char *name;
@@ -226,9 +238,10 @@ HPyAPI_FUNC void HPyField_Store(HPyContext *ctx, HPy target_obj,
                                 HPyField *target_field, HPy h)
 {
     PyObject *obj = _h2py(h);
-    Py_XDECREF(_hf2py(*target_field));
+    PyObject *target_py_obj = _hf2py(*target_field);
     Py_XINCREF(obj);
     *target_field = _py2hf(obj);
+    Py_XDECREF(target_py_obj);
 }
 
 HPyAPI_FUNC HPy HPyField_Load(HPyContext *ctx, HPy source_obj, HPyField source_field)
@@ -238,6 +251,21 @@ HPyAPI_FUNC HPy HPyField_Load(HPyContext *ctx, HPy source_obj, HPyField source_f
     return _py2h(obj);
 }
 
+HPyAPI_FUNC void HPyGlobal_Store(HPyContext *ctx, HPyGlobal *global, HPy h)
+{
+    PyObject *obj = _h2py(h);
+    Py_XDECREF(_hg2py(*global));
+    Py_XINCREF(obj);
+    *global = _py2hg(obj);
+}
+
+HPyAPI_FUNC HPy HPyGlobal_Load(HPyContext *ctx, HPyGlobal global)
+{
+    PyObject *obj = _hg2py(global);
+    Py_INCREF(obj);
+    return _py2h(obj);
+}
+
 HPyAPI_FUNC HPy HPy_FromPyObject(HPyContext *ctx, PyObject *obj)
 {
     Py_XINCREF(obj);

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

@@ -19,6 +19,9 @@ typedef struct {
     HPy_ssize_t size;
     cpy_PyMethodDef *legacy_methods;
     HPyDef **defines;   /* points to an array of 'HPyDef *' */
+    /* array with pointers to statically allocated HPyGlobal,
+     * with NULL at the end as a sentinel. */
+    HPyGlobal **globals;
 } HPyModuleDef;
 
 

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

@@ -13,6 +13,30 @@ typedef struct {
     int basicsize;
     int itemsize;
     unsigned long flags;
+    /*
+       A type whose struct starts with PyObject_HEAD is a legacy type. A
+       legacy type must set .legacy = true in its HPyType_Spec.
+       A type is a non-legacy type, also called HPy pure type, if its struct
+       does not include PyObject_HEAD. Using pure types should be preferred.
+       Legacy types are available to allow gradual porting of existing CPython
+       extensions.
+
+       A type with .legacy_slots not NULL is required to have .legacy = true and to
+       include PyObject_HEAD at the start of its struct. It would be easy to
+       relax this requirement on CPython (where the PyObject_HEAD fields are
+       always present) but a large burden on other implementations (e.g. PyPy,
+       GraalPython) where a struct starting with PyObject_HEAD might not exist.
+
+       Types that do not define a struct of their own, should set the value of
+       .legacy to the same value as the type they inherit from. If they inherit
+       from a built-in type, they may set .legacy to either true or false, depending
+       on whether they still use .legacy_slots or not.
+
+       Pure HPy types that inherit a builtin type and define their own struct are
+       not supported at the moment. One can use legacy types in the meanwhile.
+
+       Types created via the old Python C API are automatically legacy types.
+     */
     int legacy;
     void *legacy_slots; // PyType_Slot *
     HPyDef **defines;   /* points to an array of 'HPyDef *' */
@@ -36,37 +60,6 @@ typedef struct {
 #define _Py_TPFLAGS_HAVE_VERSION_TAG (1UL << 18)
 #define HPy_TPFLAGS_DEFAULT (_Py_TPFLAGS_HEAPTYPE | _Py_TPFLAGS_HAVE_VERSION_TAG)
 
-/* HPy_TPFLAGS_INTERNAL_PURE is set automatically on pure types created with
-   HPyType_FromSpec. This flag should not be used directly. Set
-   `.legacy = false` or `.legacy = true` instead.
-
-   A custom type is a pure type if its struct does not include PyObject_HEAD.
-   A type whose struct does start with PyObject_HEAD is a legacy type. A
-   legacy type must set .legacy = true in its HPyType_Spec.
-
-   A type with .legacy_slots not NULL is required to have .legacy = true and to
-   include PyObject_HEAD at the start of its struct. It would be easy to
-   relax this requirement on CPython (where the PyObject_HEAD fields are
-   always present) but a large burden on other implementations (e.g. PyPy,
-   GraalPython) where a struct starting with PyObject_HEAD might not exist.
-
-   Types that do not define a struct of their own, should set the value of
-   .legacy to the same value as the type they inherit from. If they inherit
-   from a built-in type, they may .legacy to either true or false, depending on
-   whether they still use .legacy_slots or not.
-
-   Types created via the old Python C API are automatically legacy types.
-
-   Note on the choice of bit 8: Bit 8 looks likely to be the last free TPFLAG
-   bit that C Python will allocate. Bits 0 to 8 were dropped in Python 3.0 and
-   are being re-allocated slowly from 0 towards 8. As of 3.10, only bit 0 has
-   been re-allocated.
-*/
-#define HPy_TPFLAGS_INTERNAL_PURE (1UL << 8)
-
-#define HPy_TPFLAGS_INTERNAL_IS_HPY_TYPE (1UL << 7)
-
-
 /* Set if the type allows subclassing */
 #define HPy_TPFLAGS_BASETYPE (1UL << 10)
 

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

@@ -108,6 +108,8 @@ struct _HPyContext_s {
     unsigned long long (*ctx_Long_AsUnsignedLongLongMask)(HPyContext *ctx, HPy h);
     size_t (*ctx_Long_AsSize_t)(HPyContext *ctx, HPy h);
     HPy_ssize_t (*ctx_Long_AsSsize_t)(HPyContext *ctx, HPy h);
+    void *(*ctx_Long_AsVoidPtr)(HPyContext *ctx, HPy h);
+    double (*ctx_Long_AsDouble)(HPyContext *ctx, HPy h);
     HPy (*ctx_Float_FromDouble)(HPyContext *ctx, double v);
     double (*ctx_Float_AsDouble)(HPyContext *ctx, HPy h);
     HPy (*ctx_Bool_FromLong)(HPyContext *ctx, long v);
@@ -161,6 +163,7 @@ struct _HPyContext_s {
     HPy (*ctx_Err_NewException)(HPyContext *ctx, const char *name, HPy base, HPy dict);
     HPy (*ctx_Err_NewExceptionWithDoc)(HPyContext *ctx, const char *name, const char *doc, HPy base, HPy dict);
     int (*ctx_Err_WarnEx)(HPyContext *ctx, HPy category, const char *message, HPy_ssize_t stack_level);
+    void (*ctx_Err_WriteUnraisable)(HPyContext *ctx, HPy obj);
     int (*ctx_IsTrue)(HPyContext *ctx, HPy h);
     HPy (*ctx_Type_FromSpec)(HPyContext *ctx, HPyType_Spec *spec, HPyType_SpecParam *params);
     HPy (*ctx_Type_GenericNew)(HPyContext *ctx, HPy type, HPy *args, HPy_ssize_t nargs, HPy kw);
@@ -237,5 +240,7 @@ struct _HPyContext_s {
     HPy (*ctx_Field_Load)(HPyContext *ctx, HPy source_object, HPyField source_field);
     HPyThreadState (*ctx_LeavePythonExecution)(HPyContext *ctx);
     void (*ctx_ReenterPythonExecution)(HPyContext *ctx, HPyThreadState state);
+    void (*ctx_Global_Store)(HPyContext *ctx, HPyGlobal *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

@@ -78,6 +78,14 @@ HPyAPI_FUNC HPy_ssize_t HPyLong_AsSsize_t(HPyContext *ctx, HPy h) {
      return ctx->ctx_Long_AsSsize_t ( ctx, h ); 
 }
 
+HPyAPI_FUNC void *HPyLong_AsVoidPtr(HPyContext *ctx, HPy h) {
+     return ctx->ctx_Long_AsVoidPtr ( ctx, h ); 
+}
+
+HPyAPI_FUNC double HPyLong_AsDouble(HPyContext *ctx, HPy h) {
+     return ctx->ctx_Long_AsDouble ( ctx, h ); 
+}
+
 HPyAPI_FUNC HPy HPyFloat_FromDouble(HPyContext *ctx, double v) {
      return ctx->ctx_Float_FromDouble ( ctx, v ); 
 }
@@ -286,6 +294,10 @@ HPyAPI_FUNC int HPyErr_WarnEx(HPyContext *ctx, HPy category, const char *message
      return ctx->ctx_Err_WarnEx ( ctx, category, message, stack_level ); 
 }
 
+HPyAPI_FUNC void HPyErr_WriteUnraisable(HPyContext *ctx, HPy obj) {
+     ctx->ctx_Err_WriteUnraisable ( ctx, obj ); 
+}
+
 HPyAPI_FUNC int HPy_IsTrue(HPyContext *ctx, HPy h) {
      return ctx->ctx_IsTrue ( ctx, h ); 
 }
@@ -586,6 +598,14 @@ HPyAPI_FUNC void HPy_ReenterPythonExecution(HPyContext *ctx, HPyThreadState stat
      ctx->ctx_ReenterPythonExecution ( ctx, state ); 
 }
 
+HPyAPI_FUNC void HPyGlobal_Store(HPyContext *ctx, HPyGlobal *global, HPy h) {
+     ctx->ctx_Global_Store ( ctx, global, h ); 
+}
+
+HPyAPI_FUNC HPy HPyGlobal_Load(HPyContext *ctx, HPyGlobal global) {
+     return ctx->ctx_Global_Load ( ctx, global ); 
+}
+
 HPyAPI_FUNC void _HPy_Dump(HPyContext *ctx, HPy h) {
      ctx->ctx_Dump ( ctx, h ); 
 }

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

@@ -1,4 +1,4 @@
 
 // automatically generated by setup.py:get_scm_config()
-#define HPY_VERSION "0.0.4.dev195+g91734aa"
-#define HPY_GIT_REVISION "91734aa"
+#define HPY_VERSION "0.0.4.dev216+gf941e8f"
+#define HPY_GIT_REVISION "f941e8f"