[GR-31206] Update HPy import.

PullRequest: graalpython/1802

Author: fangerer

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "678366cf6c0b054e751248aec4d939526f029a21" }
+{ "overlay": "3c6f644a6a6c7d27bae5b0d82445818549a83175" }

graalpython/com.oracle.graal.python.cext/hpy/hpy.c

@@ -48,7 +48,6 @@
 #define UNWRAP(_h) ((_h)._i)
 #define WRAP(_ptr) ((HPy){(_ptr)})
 
-
 typedef HPyDef* HPyDefPtr;
 
 POLYGLOT_DECLARE_TYPE(HPy);
@@ -91,6 +90,10 @@ void* graal_hpy_calloc(size_t count, size_t eltsize) {
 	return calloc(count, eltsize);
 }
 
+void graal_hpy_free(void *ptr) {
+	free(ptr);
+}
+
 void* graal_hpy_from_HPy_array(void *arr, uint64_t len) {
 	return polyglot_from_HPy_array(arr, len);
 }
@@ -571,3 +574,9 @@ int graal_hpy_bulk_free(void* ptrArray[], int64_t len) {
 	}
     return 0;
 }
+
+POLYGLOT_DECLARE_TYPE(HPy_buffer);
+HPy_buffer *graal_hpy_allocate_buffer() {
+	return polyglot_from_HPy_buffer((HPy_buffer *) malloc(sizeof(HPy_buffer)));
+}
+

graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyfunc_declare.h

@@ -63,6 +63,8 @@
 #define _HPyFunc_DECLARE_HPyFunc_GETTER(SYM) static HPy SYM(HPyContext ctx, HPy, void *)
 #define _HPyFunc_DECLARE_HPyFunc_SETTER(SYM) static int SYM(HPyContext ctx, HPy, HPy, void *)
 #define _HPyFunc_DECLARE_HPyFunc_OBJOBJPROC(SYM) static int SYM(HPyContext ctx, HPy, HPy)
+#define _HPyFunc_DECLARE_HPyFunc_GETBUFFERPROC(SYM) static int SYM(HPyContext, HPy, HPy_buffer *, int)
+#define _HPyFunc_DECLARE_HPyFunc_RELEASEBUFFERPROC(SYM) static void SYM(HPyContext, HPy, HPy_buffer *)
 #define _HPyFunc_DECLARE_HPyFunc_DESTROYFUNC(SYM) static void SYM(void *)
 
 typedef HPy (*HPyFunc_noargs)(HPyContext ctx, HPy self);
@@ -95,4 +97,6 @@ typedef int (*HPyFunc_initproc)(HPyContext ctx, HPy self, HPy *args, HPy_ssize_t
 typedef HPy (*HPyFunc_getter)(HPyContext ctx, HPy, void *);
 typedef int (*HPyFunc_setter)(HPyContext ctx, HPy, HPy, void *);
 typedef int (*HPyFunc_objobjproc)(HPyContext ctx, HPy, HPy);
+typedef int (*HPyFunc_getbufferproc)(HPyContext, HPy, HPy_buffer *, int);
+typedef void (*HPyFunc_releasebufferproc)(HPyContext, HPy, HPy_buffer *);
 typedef void (*HPyFunc_destroyfunc)(void *);

graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyslot.h

@@ -34,6 +34,8 @@
 */
 
 typedef enum {
+    HPy_bf_getbuffer = 1,
+    HPy_bf_releasebuffer = 2,
     HPy_nb_absolute = 6,
     HPy_nb_add = 7,
     HPy_nb_and = 8,
@@ -84,6 +86,8 @@ typedef enum {
     HPy_tp_destroy = 1000,
 } HPySlot_Slot;
 
+#define _HPySlot_SIG__HPy_bf_getbuffer HPyFunc_GETBUFFERPROC
+#define _HPySlot_SIG__HPy_bf_releasebuffer HPyFunc_RELEASEBUFFERPROC
 #define _HPySlot_SIG__HPy_nb_absolute HPyFunc_UNARYFUNC
 #define _HPySlot_SIG__HPy_nb_add HPyFunc_BINARYFUNC
 #define _HPySlot_SIG__HPy_nb_and HPyFunc_BINARYFUNC

graalpython/com.oracle.graal.python.cext/include/common/autogen_impl.h

@@ -113,6 +113,11 @@ HPyAPI_STORAGE double _HPy_IMPL_NAME(Float_AsDouble)(HPyContext ctx, HPy h)
     return PyFloat_AsDouble(_h2py(h));
 }
 
+HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Bool_FromLong)(HPyContext ctx, long v)
+{
+    return _py2h(PyBool_FromLong(v));
+}
+
 HPyAPI_STORAGE HPy_ssize_t _HPy_IMPL_NAME_NOPREFIX(Length)(HPyContext ctx, HPy h)
 {
     return PyObject_Length(_h2py(h));
@@ -363,6 +368,11 @@ HPyAPI_STORAGE int _HPy_IMPL_NAME_NOPREFIX(SetItem)(HPyContext ctx, HPy obj, HPy
     return PyObject_SetItem(_h2py(obj), _h2py(key), _h2py(value));
 }
 
+HPyAPI_STORAGE HPy _HPy_IMPL_NAME_NOPREFIX(Type)(HPyContext ctx, HPy obj)
+{
+    return _py2h(PyObject_Type(_h2py(obj)));
+}
+
 HPyAPI_STORAGE HPy _HPy_IMPL_NAME_NOPREFIX(Repr)(HPyContext ctx, HPy obj)
 {
     return _py2h(PyObject_Repr(_h2py(obj)));

graalpython/com.oracle.graal.python.cext/include/common/cpy_types.h

@@ -38,6 +38,7 @@ typedef struct PyMethodDef cpy_PyMethodDef;
 typedef PyType_Slot cpy_PyTypeSlot;
 typedef PyGetSetDef cpy_PyGetSetDef;
 typedef PyMemberDef cpy_PyMemberDef;
+typedef struct bufferinfo cpy_Py_buffer;
 
 
 #endif /* HPY_UNIVERSAL_CPY_TYPES_H */

graalpython/com.oracle.graal.python.cext/include/common/hpyfunc.h

@@ -33,6 +33,8 @@ typedef enum {
 
     HPyFunc_DESTROYFUNC,
 
+    HPyFunc_GETBUFFERPROC,
+    HPyFunc_RELEASEBUFFERPROC,
     HPyFunc_UNARYFUNC,
     HPyFunc_BINARYFUNC,
     HPyFunc_TERNARYFUNC,
@@ -94,6 +96,19 @@ typedef enum {
     enum { SYM##_sig = SIG };              \
     _HPyFunc_TRAMPOLINE_##SIG(SYM, IMPL)
 
+typedef struct {
+    void *buf;
+    HPy obj;        /* owned reference */
+    HPy_ssize_t len;
+    HPy_ssize_t itemsize;
+    int readonly;
+    int ndim;
+    char *format;
+    HPy_ssize_t *shape;
+    HPy_ssize_t *strides;
+    HPy_ssize_t *suboffsets;
+    void *internal;
+} HPy_buffer;
 
 #include "autogen_hpyfunc_declare.h"
 

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

@@ -53,6 +53,7 @@ typedef struct {
     unsigned int flags;
     void *legacy_slots; // PyType_Slot *
     HPyDef **defines;   /* points to an array of 'HPyDef *' */
+    const char* doc;    /* UTF-8 doc string or NULL */
 } HPyType_Spec;
 
 typedef enum {

graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_object.h

@@ -29,5 +29,6 @@
 #include "hpy.h"
 
 _HPy_HIDDEN void ctx_Dump(HPyContext ctx, HPy h);
+_HPy_HIDDEN int ctx_TypeCheck(HPyContext ctx, HPy h_obj, HPy h_type);
 
 #endif /* HPY_COMMON_RUNTIME_CTX_OBJECT_H */

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

@@ -23,5 +23,5 @@
  */
 
 // automatically generated by setup.py:get_scm_config()
-#define HPY_VERSION "0.1.dev965+g6d3b941"
-#define HPY_GIT_REVISION "6d3b941"
+#define HPY_VERSION "0.0.2.dev144+ng1d5d4c5"
+#define HPY_GIT_REVISION "1d5d4c5"