[GR-29198] [GR-26596] Update HPy Import.

PullRequest: graalpython/1599

Author: fangerer

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

@@ -281,6 +281,10 @@ void* graal_hpy_from_string(const char *ptr) {
 	return polyglot_from_string(ptr, SRC_CS);
 }
 
+uint64_t graal_hpy_strlen(const char *ptr) {
+	return strlen(ptr);
+}
+
 /* getters for HPyType_Spec */
 
 void* graal_hpy_type_spec_get_defines(HPyType_Spec *type_spec) {
@@ -412,11 +416,15 @@ double graal_hpy_read_d(void* object, HPy_ssize_t offset) {
 }
 
 void* graal_hpy_read_string(void* object, HPy_ssize_t offset) {
-    return polyglot_from_string(ReadMember(object, offset, char*), "utf-8");
+    char *ptr = ReadMember(object, offset, char*);
+    if (ptr != NULL) {
+    	return polyglot_from_string(ReadMember(object, offset, char*), "utf-8");
+    }
+    return NULL;
 }
 
 void* graal_hpy_read_string_in_place(void* object, HPy_ssize_t offset) {
-	char *addr = (char*) (((char*)object) + offset);
+    char *addr = (char*) (((char*)object) + offset);
     return polyglot_from_string(addr, "utf-8");
 }
 

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

@@ -60,6 +60,7 @@
 #define _HPyFunc_DECLARE_HPyFunc_INITPROC(SYM) static int SYM(HPyContext ctx, HPy self, HPy *args, HPy_ssize_t nargs, HPy kw)
 #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_DESTROYFUNC(SYM) static void SYM(void *)
 
 typedef HPy (*HPyFunc_noargs)(HPyContext ctx, HPy self);
@@ -91,4 +92,5 @@ typedef int (*HPyFunc_descrsetfunc)(HPyContext ctx, HPy, HPy, HPy);
 typedef int (*HPyFunc_initproc)(HPyContext ctx, HPy self, HPy *args, HPy_ssize_t nargs, HPy kw);
 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 void (*HPyFunc_destroyfunc)(void *);

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

@@ -65,8 +65,14 @@ typedef enum {
     HPy_nb_subtract = 36,
     HPy_nb_true_divide = 37,
     HPy_nb_xor = 38,
+    HPy_sq_ass_item = 39,
+    HPy_sq_concat = 40,
+    HPy_sq_contains = 41,
+    HPy_sq_inplace_concat = 42,
+    HPy_sq_inplace_repeat = 43,
     HPy_sq_item = 44,
     HPy_sq_length = 45,
+    HPy_sq_repeat = 46,
     HPy_tp_init = 60,
     HPy_tp_new = 65,
     HPy_tp_repr = 66,
@@ -108,8 +114,14 @@ typedef enum {
 #define _HPySlot_SIG__HPy_nb_subtract HPyFunc_BINARYFUNC
 #define _HPySlot_SIG__HPy_nb_true_divide HPyFunc_BINARYFUNC
 #define _HPySlot_SIG__HPy_nb_xor HPyFunc_BINARYFUNC
+#define _HPySlot_SIG__HPy_sq_ass_item HPyFunc_SSIZEOBJARGPROC
+#define _HPySlot_SIG__HPy_sq_concat HPyFunc_BINARYFUNC
+#define _HPySlot_SIG__HPy_sq_contains HPyFunc_OBJOBJPROC
+#define _HPySlot_SIG__HPy_sq_inplace_concat HPyFunc_BINARYFUNC
+#define _HPySlot_SIG__HPy_sq_inplace_repeat HPyFunc_SSIZEARGFUNC
 #define _HPySlot_SIG__HPy_sq_item HPyFunc_SSIZEARGFUNC
 #define _HPySlot_SIG__HPy_sq_length HPyFunc_LENFUNC
+#define _HPySlot_SIG__HPy_sq_repeat HPyFunc_SSIZEARGFUNC
 #define _HPySlot_SIG__HPy_tp_init HPyFunc_INITPROC
 #define _HPySlot_SIG__HPy_tp_new HPyFunc_KEYWORDS
 #define _HPySlot_SIG__HPy_tp_repr HPyFunc_REPRFUNC

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

@@ -66,6 +66,41 @@ HPyAPI_STORAGE long _HPy_IMPL_NAME(Long_AsLong)(HPyContext ctx, HPy h)
     return PyLong_AsLong(_h2py(h));
 }
 
+HPyAPI_STORAGE unsigned long _HPy_IMPL_NAME(Long_AsUnsignedLong)(HPyContext ctx, HPy h)
+{
+    return PyLong_AsUnsignedLong(_h2py(h));
+}
+
+HPyAPI_STORAGE unsigned long _HPy_IMPL_NAME(Long_AsUnsignedLongMask)(HPyContext ctx, HPy h)
+{
+    return PyLong_AsUnsignedLongMask(_h2py(h));
+}
+
+HPyAPI_STORAGE long long _HPy_IMPL_NAME(Long_AsLongLong)(HPyContext ctx, HPy h)
+{
+    return PyLong_AsLongLong(_h2py(h));
+}
+
+HPyAPI_STORAGE unsigned long long _HPy_IMPL_NAME(Long_AsUnsignedLongLong)(HPyContext ctx, HPy h)
+{
+    return PyLong_AsUnsignedLongLong(_h2py(h));
+}
+
+HPyAPI_STORAGE unsigned long long _HPy_IMPL_NAME(Long_AsUnsignedLongLongMask)(HPyContext ctx, HPy h)
+{
+    return PyLong_AsUnsignedLongLongMask(_h2py(h));
+}
+
+HPyAPI_STORAGE size_t _HPy_IMPL_NAME(Long_AsSize_t)(HPyContext ctx, HPy h)
+{
+    return PyLong_AsSize_t(_h2py(h));
+}
+
+HPyAPI_STORAGE HPy_ssize_t _HPy_IMPL_NAME(Long_AsSsize_t)(HPyContext ctx, HPy h)
+{
+    return PyLong_AsSsize_t(_h2py(h));
+}
+
 HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Float_FromDouble)(HPyContext ctx, double v)
 {
     return _py2h(PyFloat_FromDouble(v));
@@ -261,11 +296,21 @@ HPyAPI_STORAGE void _HPy_IMPL_NAME(Err_SetString)(HPyContext ctx, HPy h_type, co
     PyErr_SetString(_h2py(h_type), message);
 }
 
+HPyAPI_STORAGE void _HPy_IMPL_NAME(Err_SetObject)(HPyContext ctx, HPy h_type, HPy h_value)
+{
+    PyErr_SetObject(_h2py(h_type), _h2py(h_value));
+}
+
 HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Err_NoMemory)(HPyContext ctx)
 {
     return _py2h(PyErr_NoMemory());
 }
 
+HPyAPI_STORAGE void _HPy_IMPL_NAME(Err_Clear)(HPyContext ctx)
+{
+    PyErr_Clear();
+}
+
 HPyAPI_STORAGE int _HPy_IMPL_NAME_NOPREFIX(IsTrue)(HPyContext ctx, HPy h)
 {
     return PyObject_IsTrue(_h2py(h));
@@ -371,6 +416,16 @@ HPyAPI_STORAGE char *_HPy_IMPL_NAME(Bytes_AS_STRING)(HPyContext ctx, HPy h)
     return PyBytes_AS_STRING(_h2py(h));
 }
 
+HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Bytes_FromString)(HPyContext ctx, const char *v)
+{
+    return _py2h(PyBytes_FromString(v));
+}
+
+HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Bytes_FromStringAndSize)(HPyContext ctx, const char *v, HPy_ssize_t len)
+{
+    return _py2h(PyBytes_FromStringAndSize(v, len));
+}
+
 HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Unicode_FromString)(HPyContext ctx, const char *utf8)
 {
     return _py2h(PyUnicode_FromString(utf8));
@@ -416,13 +471,3 @@ HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Dict_New)(HPyContext ctx)
     return _py2h(PyDict_New());
 }
 
-HPyAPI_STORAGE int _HPy_IMPL_NAME(Dict_SetItem)(HPyContext ctx, HPy h_dict, HPy h_key, HPy h_val)
-{
-    return PyDict_SetItem(_h2py(h_dict), _h2py(h_key), _h2py(h_val));
-}
-
-HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Dict_GetItem)(HPyContext ctx, HPy h_dict, HPy h_key)
-{
-    return _py2h(PyDict_GetItem(_h2py(h_dict), _h2py(h_key)));
-}
-

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

@@ -58,6 +58,7 @@ typedef enum {
     HPyFunc_INITPROC,
     HPyFunc_GETTER,
     HPyFunc_SETTER,
+    HPyFunc_OBJOBJPROC,
 
 } HPyFunc_Signature;
 

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

@@ -69,11 +69,12 @@ typedef struct {
 
 /* All types are dynamically allocated */
 #define _Py_TPFLAGS_HEAPTYPE (1UL << 9)
+#define _Py_TPFLAGS_HAVE_VERSION_TAG (1UL << 18)
 
 /* Set if the type allows subclassing */
 #define HPy_TPFLAGS_BASETYPE (1UL << 10)
 
-#define HPy_TPFLAGS_DEFAULT _Py_TPFLAGS_HEAPTYPE
+#define HPy_TPFLAGS_DEFAULT (_Py_TPFLAGS_HEAPTYPE | _Py_TPFLAGS_HAVE_VERSION_TAG)
 
 #define HPy_CAST(ctx, return_type, h) ((return_type *) _HPy_Cast(ctx, h))
 

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

@@ -28,10 +28,10 @@
 #include "hpy.h"
 
 HPyAPI_RUNTIME_FUNC(int)
-HPyArg_Parse(HPyContext ctx, HPy *args, HPy_ssize_t nargs, const char *fmt, ...);
+HPyArg_Parse(HPyContext ctx, HPyTracker *ht, HPy *args, HPy_ssize_t nargs, const char *fmt, ...);
 
 HPyAPI_RUNTIME_FUNC(int)
-HPyArg_ParseKeywords(HPyContext ctx, HPy *args, HPy_ssize_t nargs, HPy kw,
+HPyArg_ParseKeywords(HPyContext ctx, HPyTracker *ht, HPy *args, HPy_ssize_t nargs, HPy kw,
                      const char *fmt, const char *keywords[], ...);
 
 

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

@@ -34,9 +34,9 @@ _HPy_HIDDEN int
 ctx_Tracker_Add(HPyContext ctx, HPyTracker ht, HPy h);
 
 _HPy_HIDDEN void
-ctx_Tracker_RemoveAll(HPyContext ctx, HPyTracker ht);
+ctx_Tracker_ForgetAll(HPyContext ctx, HPyTracker ht);
 
 _HPy_HIDDEN void
-ctx_Tracker_Free(HPyContext ctx, HPyTracker ht);
+ctx_Tracker_Close(HPyContext ctx, HPyTracker ht);
 
 #endif /* HPY_COMMON_RUNTIME_CTX_TRACKER_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.dev618+g2f53dbf"
-#define HPY_GIT_REVISION "2f53dbf"
+#define HPY_VERSION "0.1.dev875+g7c832a2"
+#define HPY_GIT_REVISION "7c832a2"

graalpython/com.oracle.graal.python.cext/include/cpython/autogen_hpyfunc_trampolines.h

@@ -152,3 +152,8 @@
     { \
         return (IMPL(_HPyGetContext(), _py2h(arg0), _py2h(arg1), arg2)); \
     }
+#define _HPyFunc_TRAMPOLINE_HPyFunc_OBJOBJPROC(SYM, IMPL) \
+    static int SYM(cpy_PyObject *arg0, cpy_PyObject *arg1) \
+    { \
+        return (IMPL(_HPyGetContext(), _py2h(arg0), _py2h(arg1))); \
+    }