Update HPy inlined files: 6d3b941

fangerer · fangerer · commit f832e4f98ce2 · 2021-03-31T11:57:20.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyfunc_declare.h b/graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyfunc_declare.h
@@ -31,7 +31,7 @@
 #define _HPyFunc_DECLARE_HPyFunc_SETATTROFUNC(SYM) static int SYM(HPyContext ctx, HPy, HPy, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_REPRFUNC(SYM) static HPy SYM(HPyContext ctx, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_HASHFUNC(SYM) static HPy_hash_t SYM(HPyContext ctx, HPy)
-#define _HPyFunc_DECLARE_HPyFunc_RICHCMPFUNC(SYM) static HPy SYM(HPyContext ctx, HPy, HPy, int)
+#define _HPyFunc_DECLARE_HPyFunc_RICHCMPFUNC(SYM) static HPy SYM(HPyContext ctx, HPy, HPy, HPy_RichCmpOp)
 #define _HPyFunc_DECLARE_HPyFunc_GETITERFUNC(SYM) static HPy SYM(HPyContext ctx, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_ITERNEXTFUNC(SYM) static HPy SYM(HPyContext ctx, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_DESCRGETFUNC(SYM) static HPy SYM(HPyContext ctx, HPy, HPy, HPy)
@@ -63,7 +63,7 @@ typedef int (*HPyFunc_setattrfunc)(HPyContext ctx, HPy, char *, HPy);
 typedef int (*HPyFunc_setattrofunc)(HPyContext ctx, HPy, HPy, HPy);
 typedef HPy (*HPyFunc_reprfunc)(HPyContext ctx, HPy);
 typedef HPy_hash_t (*HPyFunc_hashfunc)(HPyContext ctx, HPy);
-typedef HPy (*HPyFunc_richcmpfunc)(HPyContext ctx, HPy, HPy, int);
+typedef HPy (*HPyFunc_richcmpfunc)(HPyContext ctx, HPy, HPy, HPy_RichCmpOp);
 typedef HPy (*HPyFunc_getiterfunc)(HPyContext ctx, HPy);
 typedef HPy (*HPyFunc_iternextfunc)(HPyContext ctx, HPy);
 typedef HPy (*HPyFunc_descrgetfunc)(HPyContext ctx, HPy, HPy, HPy);
diff --git a/graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyslot.h b/graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyslot.h
@@ -55,6 +55,7 @@ typedef enum {
     HPy_tp_init = 60,
     HPy_tp_new = 65,
     HPy_tp_repr = 66,
+    HPy_tp_richcompare = 67,
     HPy_nb_matrix_multiply = 75,
     HPy_nb_inplace_matrix_multiply = 76,
     HPy_tp_destroy = 1000,
@@ -104,6 +105,7 @@ typedef enum {
 #define _HPySlot_SIG__HPy_tp_init HPyFunc_INITPROC
 #define _HPySlot_SIG__HPy_tp_new HPyFunc_KEYWORDS
 #define _HPySlot_SIG__HPy_tp_repr HPyFunc_REPRFUNC
+#define _HPySlot_SIG__HPy_tp_richcompare HPyFunc_RICHCMPFUNC
 #define _HPySlot_SIG__HPy_nb_matrix_multiply HPyFunc_BINARYFUNC
 #define _HPySlot_SIG__HPy_nb_inplace_matrix_multiply HPyFunc_BINARYFUNC
 #define _HPySlot_SIG__HPy_tp_destroy HPyFunc_DESTROYFUNC
diff --git a/graalpython/com.oracle.graal.python.cext/include/common/macros.h b/graalpython/com.oracle.graal.python.cext/include/common/macros.h
@@ -41,9 +41,30 @@
 #define HPyTuple_Pack(ctx, n, ...) (HPyTuple_FromArray(ctx, (HPy[]){ __VA_ARGS__ }, n))
 
 /* Rich comparison opcodes */
-#define HPy_LT 0
-#define HPy_LE 1
-#define HPy_EQ 2
-#define HPy_NE 3
-#define HPy_GT 4
-#define HPy_GE 5
+typedef enum {
+    HPy_LT = 0,
+    HPy_LE = 1,
+    HPy_EQ = 2,
+    HPy_NE = 3,
+    HPy_GT = 4,
+    HPy_GE = 5,
+} HPy_RichCmpOp;
+
+// this needs to be a macro because val1 and val2 can be of arbitrary types
+#define HPy_RETURN_RICHCOMPARE(ctx, val1, val2, op)                     \
+    do {                                                                \
+        bool result;                                                    \
+        switch (op) {                                                   \
+        case HPy_EQ: result = ((val1) == (val2)); break;                \
+        case HPy_NE: result = ((val1) != (val2)); break;                \
+        case HPy_LT: result = ((val1) <  (val2)); break;                \
+        case HPy_GT: result = ((val1) >  (val2)); break;                \
+        case HPy_LE: result = ((val1) <= (val2)); break;                \
+        case HPy_GE: result = ((val1) >= (val2)); break;                \
+        default:                                                        \
+            HPy_FatalError(ctx, "Invalid value for HPy_RichCmpOp");     \
+        }                                                               \
+        if (result)                                                     \
+            return HPy_Dup(ctx, ctx->h_True);                           \
+        return HPy_Dup(ctx, ctx->h_False);                              \
+    } while (0)
diff --git a/graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_object.h b/graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_object.h
@@ -0,0 +1,9 @@
+#ifndef HPY_COMMON_RUNTIME_CTX_OBJECT_H
+#define HPY_COMMON_RUNTIME_CTX_OBJECT_H
+
+#include <Python.h>
+#include "hpy.h"
+
+_HPy_HIDDEN void ctx_Dump(HPyContext ctx, HPy h);
+
+#endif /* HPY_COMMON_RUNTIME_CTX_OBJECT_H */
diff --git a/graalpython/com.oracle.graal.python.cext/include/common/version.h b/graalpython/com.oracle.graal.python.cext/include/common/version.h
@@ -1,4 +1,4 @@
 
 // automatically generated by setup.py:get_scm_config()
-#define HPY_VERSION "0.1.dev950+g98f448a"
-#define HPY_GIT_REVISION "98f448a"
+#define HPY_VERSION "0.1.dev965+g6d3b941"
+#define HPY_GIT_REVISION "6d3b941"
diff --git a/graalpython/com.oracle.graal.python.cext/include/cpython/autogen_hpyfunc_trampolines.h b/graalpython/com.oracle.graal.python.cext/include/cpython/autogen_hpyfunc_trampolines.h
@@ -95,11 +95,6 @@
     { \
         return (IMPL(_HPyGetContext(), _py2h(arg0))); \
     }
-#define _HPyFunc_TRAMPOLINE_HPyFunc_RICHCMPFUNC(SYM, IMPL) \
-    static cpy_PyObject *SYM(cpy_PyObject *arg0, cpy_PyObject *arg1, int arg2) \
-    { \
-        return _h2py(IMPL(_HPyGetContext(), _py2h(arg0), _py2h(arg1), arg2)); \
-    }
 #define _HPyFunc_TRAMPOLINE_HPyFunc_GETITERFUNC(SYM, IMPL) \
     static cpy_PyObject *SYM(cpy_PyObject *arg0) \
     { \
diff --git a/graalpython/com.oracle.graal.python.cext/include/cpython/hpy.h b/graalpython/com.oracle.graal.python.cext/include/cpython/hpy.h
@@ -274,6 +274,7 @@ HPy_AsPyObject(HPyContext ctx, HPy h)
 #include "../common/hpymodule.h"
 #include "../common/runtime/ctx_call.h"
 #include "../common/runtime/ctx_module.h"
+#include "../common/runtime/ctx_object.h"
 #include "../common/runtime/ctx_type.h"
 #include "../common/runtime/ctx_listbuilder.h"
 #include "../common/runtime/ctx_tracker.h"
@@ -322,6 +323,12 @@ HPy_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw)
     return ctx_CallTupleDict(ctx, callable, args, kw);
 }
 
+HPyAPI_FUNC(void)
+_HPy_Dump(HPyContext ctx, HPy h)
+{
+    return ctx_Dump(ctx, h);
+}
+
 HPyAPI_FUNC(HPyListBuilder)
 HPyListBuilder_New(HPyContext ctx, HPy_ssize_t initial_size)
 {
diff --git a/graalpython/com.oracle.graal.python.cext/include/cpython/hpyfunc_trampolines.h b/graalpython/com.oracle.graal.python.cext/include/cpython/hpyfunc_trampolines.h
@@ -60,4 +60,13 @@
         Py_TYPE(self)->tp_free(self);                                   \
     }
 
+/* this needs to be written manually because HPy has a different type for
+   "op": HPy_RichCmpOp instead of int */
+#define _HPyFunc_TRAMPOLINE_HPyFunc_RICHCMPFUNC(SYM, IMPL)                 \
+    static cpy_PyObject *                                                  \
+    SYM(PyObject *self, PyObject *obj, int op)                             \
+    {                                                                      \
+        return _h2py(IMPL(_HPyGetContext(), _py2h(self), _py2h(obj), op)); \
+    }
+
 #endif // HPY_CPYTHON_HPYFUNC_TRAMPOLINES_H
diff --git a/graalpython/com.oracle.graal.python.cext/include/universal/autogen_ctx.h b/graalpython/com.oracle.graal.python.cext/include/universal/autogen_ctx.h
@@ -206,4 +206,5 @@ struct _HPyContext_s {
     int (*ctx_Tracker_Add)(HPyContext ctx, HPyTracker ht, HPy h);
     void (*ctx_Tracker_ForgetAll)(HPyContext ctx, HPyTracker ht);
     void (*ctx_Tracker_Close)(HPyContext ctx, HPyTracker ht);
+    void (*ctx_Dump)(HPyContext ctx, HPy h);
 };
diff --git a/graalpython/com.oracle.graal.python.cext/include/universal/autogen_hpyfunc_trampolines.h b/graalpython/com.oracle.graal.python.cext/include/universal/autogen_hpyfunc_trampolines.h
@@ -266,22 +266,6 @@ typedef struct {
         return a.result; \
     }
 
-typedef struct {
-    cpy_PyObject *arg0;
-    cpy_PyObject *arg1;
-    int arg2;
-    cpy_PyObject * result;
-} _HPyFunc_args_RICHCMPFUNC;
-
-#define _HPyFunc_TRAMPOLINE_HPyFunc_RICHCMPFUNC(SYM, IMPL) \
-    static cpy_PyObject *SYM(cpy_PyObject *arg0, cpy_PyObject *arg1, int arg2) \
-    { \
-        _HPyFunc_args_RICHCMPFUNC a = { arg0, arg1, arg2 }; \
-        _HPy_CallRealFunctionFromTrampoline( \
-           _ctx_for_trampolines, HPyFunc_RICHCMPFUNC, IMPL, &a); \
-        return a.result; \
-    }
-
 typedef struct {
     cpy_PyObject *arg0;
     cpy_PyObject * result;
diff --git a/graalpython/com.oracle.graal.python.cext/include/universal/autogen_trampolines.h b/graalpython/com.oracle.graal.python.cext/include/universal/autogen_trampolines.h
@@ -486,3 +486,7 @@ static inline void HPyTracker_Close(HPyContext ctx, HPyTracker ht) {
      ctx->ctx_Tracker_Close ( ctx, ht ); 
 }
 
+static inline void _HPy_Dump(HPyContext ctx, HPy h) {
+     ctx->ctx_Dump ( ctx, h ); 
+}
+
diff --git a/graalpython/com.oracle.graal.python.cext/include/universal/hpyfunc_trampolines.h b/graalpython/com.oracle.graal.python.cext/include/universal/hpyfunc_trampolines.h
@@ -34,6 +34,13 @@ typedef struct {
     int result;
 } _HPyFunc_args_INITPROC;
 
+typedef struct {
+    cpy_PyObject *arg0;
+    cpy_PyObject *arg1;
+    HPy_RichCmpOp arg2;
+    cpy_PyObject * result;
+} _HPyFunc_args_RICHCMPFUNC;
+
 
 #define _HPyFunc_TRAMPOLINE_HPyFunc_NOARGS(SYM, IMPL)                   \
     static cpy_PyObject *                                               \
@@ -98,4 +105,17 @@ typedef struct {
     }
 
 
+
+/* this needs to be written manually because HPy has a different type for
+   "op": HPy_RichCmpOp instead of int */
+#define _HPyFunc_TRAMPOLINE_HPyFunc_RICHCMPFUNC(SYM, IMPL)              \
+    static cpy_PyObject *                                               \
+    SYM(cpy_PyObject *self, cpy_PyObject *obj, int op)                  \
+    {                                                                   \
+        _HPyFunc_args_RICHCMPFUNC a = { self, obj, op };                \
+        _HPy_CallRealFunctionFromTrampoline(                            \
+           _ctx_for_trampolines, HPyFunc_RICHCMPFUNC, IMPL, &a);        \
+        return a.result;                                                \
+    }
+
 #endif // HPY_UNIVERSAL_HPYFUNC_TRAMPOLINES_H
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_object.c b/graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_object.c
@@ -0,0 +1,16 @@
+#include <Python.h>
+#include "hpy.h"
+
+#ifdef HPY_UNIVERSAL_ABI
+   // for _h2py and _py2h
+#  include "handles.h"
+#endif
+
+
+_HPy_HIDDEN void
+ctx_Dump(HPyContext ctx, HPy h)
+{
+    // just use _PyObject_Dump for now, but we might want to add more info
+    // about the handle itself in the future.
+    _PyObject_Dump(_h2py(h));
+}
diff --git a/graalpython/lib-graalpython/modules/hpy/devel/version.py b/graalpython/lib-graalpython/modules/hpy/devel/version.py
@@ -1,4 +1,4 @@
 
 # automatically generated by setup.py:get_scm_config()
-__version__ = "0.1.dev950+g98f448a"
-__git_revision__ = "98f448a"
+__version__ = "0.1.dev965+g6d3b941"
+__git_revision__ = "6d3b941"
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_object.py b/graalpython/lib-graalpython/modules/hpy/test/test_object.py
@@ -460,3 +460,20 @@ def test_length(self):
         """)
         assert mod.f([5,6,7,8]) == 4
         assert mod.f({"a": 1}) == 1
+
+    def test_dump(self):
+        # _HPy_Dump is supposed to be used e.g. inside a gdb session: it
+        # prints various about the given handle to stdout, and it's
+        # implementation-specific. As such, it's hard to write a meaningful
+        # test: let's just call it an check it doesn't crash.
+        mod = self.make_module("""
+            HPyDef_METH(f, "f", f_impl, HPyFunc_O)
+            static HPy f_impl(HPyContext ctx, HPy self, HPy arg)
+            {
+                _HPy_Dump(ctx, arg);
+                return HPy_Dup(ctx, ctx->h_None);
+            }
+            @EXPORT(f)
+            @INIT
+        """)
+        mod.f('hello')
diff --git a/graalpython/lib-graalpython/modules/hpy/test/test_slots.py b/graalpython/lib-graalpython/modules/hpy/test/test_slots.py
@@ -451,3 +451,41 @@ def test_sq_contains(self):
         assert 43 not in p
         with pytest.raises(TypeError):
             'hello' in p
+
+    def test_tp_richcompare(self):
+        import pytest
+        mod = self.make_module("""
+            @DEFINE_PointObject
+            @DEFINE_Point_new
+
+            HPyDef_SLOT(Point_cmp, Point_cmp_impl, HPy_tp_richcompare);
+            static HPy Point_cmp_impl(HPyContext ctx, HPy self, HPy o, HPy_RichCmpOp op)
+            {
+                // XXX we should check the type of o
+                PointObject *p1 = HPy_CAST(ctx, PointObject, self);
+                PointObject *p2 = HPy_CAST(ctx, PointObject, o);
+                HPy_RETURN_RICHCOMPARE(ctx, p1->x, p2->x, op);
+            }
+
+            @EXPORT_POINT_TYPE(&Point_new, &Point_cmp)
+            @INIT
+        """)
+        p1 = mod.Point(10, 10)
+        p2 = mod.Point(20, 20)
+        assert p1 == p1
+        assert not p1 == p2
+        #
+        assert p1 != p2
+        assert not p1 != p1
+        #
+        assert p1 < p2
+        assert not p1 < p1
+        #
+        assert not p1 > p2
+        assert not p1 > p1
+        #
+        assert p1 <= p2
+        assert p1 <= p1
+        #
+        assert not p1 >= p2
+        assert p1 >= p1
