Merge pull request #147 from hpyproject/feature/add-hpy-call

Add HPy_CallTupleDict,  HPyCallable_Check and HPyTuple_Check.

Author: hodgestar

docs/porting-guide.rst

@@ -46,3 +46,24 @@ For lists of (say) integers::
     HPy h_list = HPyListBuilder_i_Build(ctx, builder);
 
 And similar for building tuples or bytes
+
+
+PyObject_Call and PyObject_CallObject
+-------------------------------------
+
+Both ``PyObject_Call`` and ``PyObject_CallObject`` are replaced by
+``HPy_CallTupleDict(callable, args, kwargs)`` in which either or both of
+``args`` and ``kwargs`` may be null handles.
+
+``PyObject_Call(callable, args, kwargs)`` becomes:
+
+    HPy result = HPy_CallTupleDict(ctx, callable, args, kwargs);
+
+``PyObject_CallObject(callable, args)`` becomes:
+
+    HPy result = HPy_CallTupleDict(ctx, callable, args, HPy_NULL);
+
+If ``args`` is not a handle to a tuple or ``kwargs`` is not a handle to a
+dictionary, ``HPy_CallTupleDict`` will return ``HPy_NULL`` and raise a
+``TypeError``. This is different to ``PyObject_Call`` and
+``PyObject_CallObject`` which may segfault instead.

hpy/devel/include/common/autogen_impl.h

@@ -0,0 +1,10 @@
+#ifndef HPY_COMMON_RUNTIME_CALL_H
+#define HPY_COMMON_RUNTIME_CALL_H
+
+#include <Python.h>
+#include "hpy.h"
+
+_HPy_HIDDEN HPy
+ctx_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw);
+
+#endif /* HPY_COMMON_RUNTIME_CALL_H */

hpy/devel/include/common/runtime/ctx_call.h

@@ -272,6 +272,7 @@ HPy_AsPyObject(HPyContext ctx, HPy h)
 #include "../common/hpydef.h"
 #include "../common/hpytype.h"
 #include "../common/hpymodule.h"
+#include "../common/runtime/ctx_call.h"
 #include "../common/runtime/ctx_module.h"
 #include "../common/runtime/ctx_type.h"
 #include "../common/runtime/ctx_listbuilder.h"
@@ -315,6 +316,12 @@ _HPy_Cast(HPyContext ctx, HPy h)
     return ctx_Cast(ctx, h);
 }
 
+HPyAPI_FUNC(HPy)
+HPy_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw)
+{
+    return ctx_CallTupleDict(ctx, callable, args, kw);
+}
+
 HPyAPI_FUNC(HPyListBuilder)
 HPyListBuilder_New(HPyContext ctx, HPy_ssize_t initial_size)
 {

hpy/devel/include/cpython/hpy.h

@@ -0,0 +1,38 @@
+#include <Python.h>
+#include "hpy.h"
+
+#ifdef HPY_UNIVERSAL_ABI
+   // for _h2py and _py2h
+#  include "handles.h"
+#endif
+
+_HPy_HIDDEN HPy
+ctx_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw)
+{
+    PyObject *obj;
+    if (!HPy_IsNull(args) && !HPyTuple_Check(ctx, args)) {
+       HPyErr_SetString(ctx, ctx->h_TypeError,
+           "HPy_CallTupleDict requires args to be a tuple or null handle");
+       return HPy_NULL;
+    }
+    if (!HPy_IsNull(kw) && !HPyDict_Check(ctx, kw)) {
+       HPyErr_SetString(ctx, ctx->h_TypeError,
+           "HPy_CallTupleDict requires kw to be a dict or null handle");
+       return HPy_NULL;
+    }
+    if (HPy_IsNull(kw)) {
+        obj = PyObject_CallObject(_h2py(callable), _h2py(args));
+    }
+    else if (!HPy_IsNull(args)){
+        obj = PyObject_Call(_h2py(callable), _h2py(args), _h2py(kw));
+    }
+    else {
+        // args is null, but kw is not, so we need to create an empty args tuple
+        // for CPython's PyObject_Call
+        HPy items[] = {};
+        HPy empty_tuple = HPyTuple_FromArray(ctx, items, 0);
+        obj = PyObject_Call(_h2py(callable), _h2py(empty_tuple), _h2py(kw));
+        HPy_Close(ctx, empty_tuple);
+    }
+    return _py2h(obj);
+}

hpy/devel/include/universal/autogen_ctx.h

@@ -152,7 +152,7 @@ def _visit_hpyslot_slot(self, node):
     'HPy_SetItem_i': None,
     'HPy_SetItem_s': None,
     'HPy_Length': 'PyObject_Length',
-    'HPy_Call': 'PyObject_Call',
+    'HPy_CallTupleDict': None,
     '_HPy_Cast': None,
     'HPy_FromPyObject': None,
     'HPy_AsPyObject': None,

hpy/devel/include/universal/autogen_trampolines.h

@@ -164,7 +164,11 @@ HPy HPy_InPlaceAnd(HPyContext ctx, HPy h1, HPy h2);
 HPy HPy_InPlaceXor(HPyContext ctx, HPy h1, HPy h2);
 HPy HPy_InPlaceOr(HPyContext ctx, HPy h1, HPy h2);
 
+int HPyCallable_Check(HPyContext ctx, HPy h);
+HPy HPy_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw);
+
 /* pyerrors.h */
+void HPy_FatalError(HPyContext ctx, const char *message);
 void HPyErr_SetString(HPyContext ctx, HPy h_type, const char *message);
 void HPyErr_SetObject(HPyContext ctx, HPy h_type, HPy h_value);
 /* note: HPyErr_Occurred() returns a flag 0-or-1, instead of a 'PyObject *' */
@@ -232,10 +236,8 @@ int HPyList_Append(HPyContext ctx, HPy h_list, HPy h_item);
 int HPyDict_Check(HPyContext ctx, HPy h);
 HPy HPyDict_New(HPyContext ctx);
 
-/* pyerrors.h */
-void HPy_FatalError(HPyContext ctx, const char *message);
-
 /* tupleobject.h */
+int HPyTuple_Check(HPyContext ctx, HPy h);
 HPy HPyTuple_FromArray(HPyContext ctx, HPy items[], HPy_ssize_t n);
 // note: HPyTuple_Pack is implemented as a macro in common/macros.h