Merge pull request #455 from mattip/pypy-fixes

backport changes from PyPy

Author: fangerer

.github/workflows/ci.yml

@@ -292,7 +292,8 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          # autogen needs distutils
+          python-version: '3.11'
 
       - name: Install/Upgrade Python dependencies
         run: python -m pip install --upgrade pip wheel

hpy/debug/src/_debugmod.c

@@ -10,7 +10,7 @@
 static UHPy new_DebugHandleObj(HPyContext *uctx, UHPy u_DebugHandleType,
                                DebugHandle *handle);
 
-HPY_MOD_EMBEDDABLE(_trace)
+HPY_MOD_EMBEDDABLE(_debug)
 
 HPyDef_METH(new_generation, "new_generation", HPyFunc_NOARGS)
 static UHPy new_generation_impl(HPyContext *uctx, UHPy self)

hpy/debug/src/autogen_debug_ctx_init.h

@@ -256,7 +256,7 @@ const char *debug_ctx_Bytes_AS_STRING(HPyContext *dctx, DHPy h)
     return (const char *)protect_and_associate_data_ptr(h, (void *)ptr, data_size);
 }
 
-DHPy debug_ctx_Tuple_FromArray(HPyContext *dctx, DHPy dh_items[], HPy_ssize_t n)
+DHPy debug_ctx_Tuple_FromArray(HPyContext *dctx, const DHPy dh_items[], HPy_ssize_t n)
 {
     if (!get_ctx_info(dctx)->is_valid) {
         report_invalid_debug_context();

hpy/debug/src/debug_ctx.c

@@ -202,7 +202,16 @@ typedef struct {
 #define HPy_TPFLAGS_HAVE_GC (1UL << 14)
 
 /** Convenience macro which is equivalent to:
-    ``HPyType_HELPERS(TYPE, HPyType_BuiltinShape_Legacy)`` */
+    ``HPyType_HELPERS(TYPE, HPyType_BuiltinShape_Legacy)`` 
+    For instance, HPyType_LEGACY_HELPERS(DummyMeta) will produce::
+
+        enum { DummyMeta_SHAPE = (int)HPyType_BuiltinShape_Legacy }; 
+        __attribute__((unused)) static inline 
+        DummyMeta * 
+        DummyMeta_AsStruct(HPyContext *ctx, HPy h) { 
+            return (DummyMeta *) _HPy_AsStruct_Legacy(ctx, h); 
+        }
+*/
 #define HPyType_LEGACY_HELPERS(TYPE) \
     HPyType_HELPERS(TYPE, HPyType_BuiltinShape_Legacy)
 

hpy/devel/include/hpy/hpytype.h

@@ -56,7 +56,7 @@ _HPy_HIDDEN void ctx_TupleBuilder_Cancel(HPyContext *ctx,
                                          HPyTupleBuilder builder);
 
 // ctx_tuple.c
-_HPy_HIDDEN HPy ctx_Tuple_FromArray(HPyContext *ctx, HPy items[], HPy_ssize_t n);
+_HPy_HIDDEN HPy ctx_Tuple_FromArray(HPyContext *ctx, const HPy items[], HPy_ssize_t n);
 
 // ctx_capsule.c
 _HPy_HIDDEN HPy ctx_Capsule_New(HPyContext *ctx,

hpy/devel/include/hpy/runtime/ctx_funcs.h

@@ -8,7 +8,7 @@
 
 
 _HPy_HIDDEN HPy
-ctx_Tuple_FromArray(HPyContext *ctx, HPy items[], HPy_ssize_t n)
+ctx_Tuple_FromArray(HPyContext *ctx, const HPy items[], HPy_ssize_t n)
 {
     PyObject *res = PyTuple_New(n);
     if (!res)

hpy/devel/include/hpy/universal/autogen_ctx.h

@@ -739,7 +739,7 @@ HPy HPyDict_Copy(HPyContext *ctx, HPy h);
 HPy_ID(203)
 int HPyTuple_Check(HPyContext *ctx, HPy h);
 HPy_ID(204)
-HPy HPyTuple_FromArray(HPyContext *ctx, HPy items[], HPy_ssize_t n);
+HPy HPyTuple_FromArray(HPyContext *ctx, const HPy items[], HPy_ssize_t n);
 // note: HPyTuple_Pack is implemented as a macro in common/macros.h
 
 /* sliceobject.h */