[GR-29716] Update HPy Import.

PullRequest: graalpython/1683

Author: fangerer

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

@@ -25,7 +25,9 @@
 /*
    DO NOT EDIT THIS FILE!
 
-   This file is automatically generated by tools/autogen.py from tools/public_api.h.
+   This file is automatically generated by hpy.tools.autogen.hpyfunc.autogen_hpyfunc_declare_h
+   See also hpy.tools.autogen and hpy/tools/public_api.h
+
    Run this to regenerate:
        make autogen
 

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

@@ -25,7 +25,9 @@
 /*
    DO NOT EDIT THIS FILE!
 
-   This file is automatically generated by tools/autogen.py from tools/public_api.h.
+   This file is automatically generated by hpy.tools.autogen.hpyslot.autogen_hpyslot_h
+   See also hpy.tools.autogen and hpy/tools/public_api.h
+
    Run this to regenerate:
        make autogen
 

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

@@ -25,7 +25,9 @@
 /*
    DO NOT EDIT THIS FILE!
 
-   This file is automatically generated by tools/autogen.py from tools/public_api.h.
+   This file is automatically generated by hpy.tools.autogen.trampolines.autogen_impl_h
+   See also hpy.tools.autogen and hpy/tools/public_api.h
+
    Run this to regenerate:
        make autogen
 
@@ -291,6 +293,11 @@ HPyAPI_STORAGE HPy _HPy_IMPL_NAME_NOPREFIX(InPlaceOr)(HPyContext ctx, HPy h1, HP
     return _py2h(PyNumber_InPlaceOr(_h2py(h1), _h2py(h2)));
 }
 
+HPyAPI_STORAGE int _HPy_IMPL_NAME(Callable_Check)(HPyContext ctx, HPy h)
+{
+    return PyCallable_Check(_h2py(h));
+}
+
 HPyAPI_STORAGE void _HPy_IMPL_NAME(Err_SetString)(HPyContext ctx, HPy h_type, const char *message)
 {
     PyErr_SetString(_h2py(h_type), message);
@@ -471,3 +478,8 @@ HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Dict_New)(HPyContext ctx)
     return _py2h(PyDict_New());
 }
 
+HPyAPI_STORAGE int _HPy_IMPL_NAME(Tuple_Check)(HPyContext ctx, HPy h)
+{
+    return PyTuple_Check(_h2py(h));
+}
+

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

@@ -0,0 +1,34 @@
+/* MIT License
+ *
+ * Copyright (c) 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2019 pyhandle
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#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 */

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.dev875+g7c832a2"
-#define HPY_GIT_REVISION "7c832a2"
+#define HPY_VERSION "0.1.dev950+g98f448a"
+#define HPY_GIT_REVISION "98f448a"

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

@@ -26,7 +26,9 @@
 /*
    DO NOT EDIT THIS FILE!
 
-   This file is automatically generated by tools/autogen.py from tools/public_api.h.
+   This file is automatically generated by hpy.tools.autogen.hpyfunc.autogen_cpython_hpyfunc_trampoline_h
+   See also hpy.tools.autogen and hpy/tools/public_api.h
+
    Run this to regenerate:
        make autogen
 

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

@@ -296,6 +296,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"
@@ -339,6 +340,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)
 {

graalpython/com.oracle.graal.python.cext/include/universal/autogen_ctx.h

@@ -26,7 +26,9 @@
 /*
    DO NOT EDIT THIS FILE!
 
-   This file is automatically generated by tools/autogen.py from tools/public_api.h.
+   This file is automatically generated by hpy.tools.autogen.ctx.autogen_ctx_h
+   See also hpy.tools.autogen and hpy/tools/public_api.h
+
    Run this to regenerate:
        make autogen
 
@@ -171,6 +173,9 @@ struct _HPyContext_s {
     HPy (*ctx_InPlaceAnd)(HPyContext ctx, HPy h1, HPy h2);
     HPy (*ctx_InPlaceXor)(HPyContext ctx, HPy h1, HPy h2);
     HPy (*ctx_InPlaceOr)(HPyContext ctx, HPy h1, HPy h2);
+    int (*ctx_Callable_Check)(HPyContext ctx, HPy h);
+    HPy (*ctx_CallTupleDict)(HPyContext ctx, HPy callable, HPy args, HPy kw);
+    void (*ctx_FatalError)(HPyContext ctx, const char *message);
     void (*ctx_Err_SetString)(HPyContext ctx, HPy h_type, const char *message);
     void (*ctx_Err_SetObject)(HPyContext ctx, HPy h_type, HPy h_value);
     int (*ctx_Err_Occurred)(HPyContext ctx);
@@ -216,8 +221,8 @@ struct _HPyContext_s {
     int (*ctx_List_Append)(HPyContext ctx, HPy h_list, HPy h_item);
     int (*ctx_Dict_Check)(HPyContext ctx, HPy h);
     HPy (*ctx_Dict_New)(HPyContext ctx);
-    void (*ctx_FatalError)(HPyContext ctx, const char *message);
     HPy (*ctx_Tuple_FromArray)(HPyContext ctx, _HPyPtr items, HPy_ssize_t n);
+    int (*ctx_Tuple_Check)(HPyContext ctx, HPy h);
     HPy (*ctx_FromPyObject)(HPyContext ctx, cpy_PyObject *obj);
     cpy_PyObject *(*ctx_AsPyObject)(HPyContext ctx, HPy h);
     void (*ctx_CallRealFunctionFromTrampoline)(HPyContext ctx, HPyFunc_Signature sig, void *func, void *args);

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

@@ -26,7 +26,9 @@
 /*
    DO NOT EDIT THIS FILE!
 
-   This file is automatically generated by tools/autogen.py from tools/public_api.h.
+   This file is automatically generated by hpy.tools.autogen.hpyfunc.autogen_hpyfunc_trampoline_h
+   See also hpy.tools.autogen and hpy/tools/public_api.h
+
    Run this to regenerate:
        make autogen
 

graalpython/com.oracle.graal.python.cext/include/universal/autogen_trampolines.h

@@ -26,7 +26,9 @@
 /*
    DO NOT EDIT THIS FILE!
 
-   This file is automatically generated by tools/autogen.py from tools/public_api.h.
+   This file is automatically generated by hpy.tools.autogen.trampolines.autogen_trampolines_h
+   See also hpy.tools.autogen and hpy/tools/public_api.h
+
    Run this to regenerate:
        make autogen
 
@@ -261,6 +263,14 @@ static inline HPy HPy_InPlaceOr(HPyContext ctx, HPy h1, HPy h2) {
      return WRAP(ctx->ctx_InPlaceOr ( ctx, UNWRAP(h1), UNWRAP(h2) )); 
 }
 
+static inline int HPyCallable_Check(HPyContext ctx, HPy h) {
+     return ctx->ctx_Callable_Check ( ctx, UNWRAP(h) ); 
+}
+
+static inline HPy HPy_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw) {
+     return WRAP(ctx->ctx_CallTupleDict ( ctx, UNWRAP(callable), UNWRAP(args), UNWRAP(kw) )); 
+}
+
 static inline void HPyErr_SetString(HPyContext ctx, HPy h_type, const char *message) {
      ctx->ctx_Err_SetString ( ctx, UNWRAP(h_type), message );
 }
@@ -437,6 +447,10 @@ static inline HPy HPyDict_New(HPyContext ctx) {
      return WRAP(ctx->ctx_Dict_New ( ctx ));
 }
 
+static inline int HPyTuple_Check(HPyContext ctx, HPy h) {
+     return ctx->ctx_Tuple_Check ( ctx, UNWRAP(h) ); 
+}
+
 static inline HPy HPyTuple_FromArray(HPyContext ctx, HPy items[], HPy_ssize_t n) {
      return WRAP(ctx->ctx_Tuple_FromArray ( ctx, (_HPyPtr)items, n ));
 }