Correctly create HPyStructSequenceBuilder

Author: fangerer

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

@@ -0,0 +1,84 @@
+#ifndef Py_CONTEXT_H
+#define Py_CONTEXT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_LIMITED_API
+
+
+PyAPI_DATA(PyTypeObject) PyContext_Type;
+typedef struct _pycontextobject PyContext;
+
+PyAPI_DATA(PyTypeObject) PyContextVar_Type;
+typedef struct _pycontextvarobject PyContextVar;
+
+PyAPI_DATA(PyTypeObject) PyContextToken_Type;
+typedef struct _pycontexttokenobject PyContextToken;
+
+
+#define PyContext_CheckExact(o) (Py_TYPE(o) == &PyContext_Type)
+#define PyContextVar_CheckExact(o) (Py_TYPE(o) == &PyContextVar_Type)
+#define PyContextToken_CheckExact(o) (Py_TYPE(o) == &PyContextToken_Type)
+
+
+PyAPI_FUNC(PyObject *) PyContext_New(void);
+PyAPI_FUNC(PyObject *) PyContext_Copy(PyObject *);
+PyAPI_FUNC(PyObject *) PyContext_CopyCurrent(void);
+
+PyAPI_FUNC(int) PyContext_Enter(PyObject *);
+PyAPI_FUNC(int) PyContext_Exit(PyObject *);
+
+
+/* Create a new context variable.
+
+   default_value can be NULL.
+*/
+PyAPI_FUNC(PyObject *) PyContextVar_New(
+    const char *name, PyObject *default_value);
+
+
+/* Get a value for the variable.
+
+   Returns -1 if an error occurred during lookup.
+
+   Returns 0 if value either was or was not found.
+
+   If value was found, *value will point to it.
+   If not, it will point to:
+
+   - default_value, if not NULL;
+   - the default value of "var", if not NULL;
+   - NULL.
+
+   '*value' will be a new ref, if not NULL.
+*/
+PyAPI_FUNC(int) PyContextVar_Get(
+    PyObject *var, PyObject *default_value, PyObject **value);
+
+
+/* Set a new value for the variable.
+   Returns NULL if an error occurs.
+*/
+PyAPI_FUNC(PyObject *) PyContextVar_Set(PyObject *var, PyObject *value);
+
+
+/* Reset a variable to its previous value.
+   Returns 0 on success, -1 on error.
+*/
+PyAPI_FUNC(int) PyContextVar_Reset(PyObject *var, PyObject *token);
+
+
+/* This method is exposed only for CPython tests. Don not use it. */
+PyAPI_FUNC(PyObject *) _PyContext_NewHamtForTests(void);
+
+
+PyAPI_FUNC(int) PyContext_ClearFreeList(void);
+
+
+#endif /* !Py_LIMITED_API */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_CONTEXT_H */

graalpython/lib-graalpython/modules/hpy/devel/src/runtime/structseq.c

@@ -138,18 +138,30 @@ HPyStructSequenceBuilder_New(HPyContext *ctx, HPy type)
 #ifdef HPY_UNIVERSAL_ABI
     HPy fields = HPy_GetAttr_s(ctx, type, "_fields");
     if (HPy_IsNull(fields)) {
+#ifdef GRAALVM_PYTHON_LLVM
+        return (HPyTupleBuilder){NULL};
+#else
         return (HPyTupleBuilder){(HPy_ssize_t)0};
+#endif
     }
     HPy_ssize_t n = HPy_Length(ctx, fields);
     if (n < 0) {
         HPy_Close(ctx, fields);
+#ifdef GRAALVM_PYTHON_LLVM
+        return (HPyTupleBuilder){NULL};
+#else
         return (HPyTupleBuilder){(HPy_ssize_t)0};
+#endif
     }
     return HPyTupleBuilder_New(ctx, n);
 #else
     PyObject *seq = PyStructSequence_New((PyTypeObject *)_h2py(type));
+#ifdef GRAALVM_PYTHON_LLVM
+    return (HPyStructSequenceBuilder){(void *)seq};
+#else
     return (HPyStructSequenceBuilder){(HPy_ssize_t)seq};
 #endif
+#endif
 }
 
 HPyAPI_HELPER void