[GR-40218] Improve important HPy API functions.

PullRequest: graalpython/2402

Author: fangerer

graalpython/com.oracle.graal.python.cext/hpy/hpy.c

@@ -44,6 +44,7 @@
 #include <truffle.h>
 
 #include <wchar.h>
+#include <string.h>
 
 #define SRC_CS "utf-8"
 #define UNWRAP(_h) ((_h)._i)
@@ -107,6 +108,10 @@ void graal_hpy_free(void *ptr) {
 	free(ptr);
 }
 
+char* graal_hpy_strdup(const char *ptr) {
+    return strdup(ptr);
+}
+
 void* graal_hpy_from_HPy_array(void *arr, uint64_t len) {
 	return polyglot_from_HPy_array(arr, len);
 }
@@ -1124,11 +1129,21 @@ HPyAPI_STORAGE int _HPy_IMPL_NAME_NOPREFIX(TypeCheck)(HPyContext *ctx, HPy obj,
 	return (int) UPCALL_I32(ctx_TypeCheck, ctx, obj, type);
 }
 
+HPyAPI_STORAGE int _HPy_IMPL_NAME_NOPREFIX(TypeCheck_g)(HPyContext *ctx, HPy obj, HPyGlobal type)
+{
+	return (int) UPCALL_I32(ctx_TypeCheck_g, ctx, obj, type);
+}
+
 HPyAPI_STORAGE int _HPy_IMPL_NAME_NOPREFIX(Is)(HPyContext *ctx, HPy obj, HPy other)
 {
 	return (int) UPCALL_I32(ctx_Is, ctx, obj, other);
 }
 
+HPyAPI_STORAGE int _HPy_IMPL_NAME_NOPREFIX(Is_g)(HPyContext *ctx, HPy obj, HPyGlobal other)
+{
+	return (int) UPCALL_I32(ctx_Is_g, ctx, obj, other);
+}
+
 HPyAPI_STORAGE void *_HPy_IMPL_NAME_NOPREFIX(AsStruct)(HPyContext *ctx, HPy obj)
 {
 	return UPCALL_HPY(ctx_AsStruct, ctx, obj);
@@ -1671,7 +1686,9 @@ HPyContext *graal_hpy_context_to_native(HPyContext *managed_context, HPyContext
     HPY_CTX_UPCALL(ctx_SetItem_s);
     HPY_CTX_UPCALL(ctx_Type);
     HPY_CTX_UPCALL(ctx_TypeCheck);
+    HPY_CTX_UPCALL(ctx_TypeCheck_g);
     HPY_CTX_UPCALL(ctx_Is);
+    HPY_CTX_UPCALL(ctx_Is_g);
     HPY_CTX_UPCALL(ctx_AsStruct);
     HPY_CTX_UPCALL(ctx_AsStructLegacy);
     HPY_CTX_UPCALL(ctx_New);

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

@@ -371,6 +371,11 @@ HPyAPI_FUNC int HPy_TypeCheck(HPyContext *ctx, HPy h_obj, HPy h_type)
     return ctx_TypeCheck(ctx, h_obj, h_type);
 }
 
+HPyAPI_FUNC int HPy_TypeCheck_g(HPyContext *ctx, HPy h_obj, HPyGlobal g_type)
+{
+    return ctx_TypeCheck_g(ctx, h_obj, g_type);
+}
+
 HPyAPI_FUNC int HPyType_IsSubtype(HPyContext *ctx, HPy h_sub, HPy h_type)
 {
     return ctx_Type_IsSubtype(ctx, h_sub, h_type);

graalpython/com.oracle.graal.python.cext/include/hpy/runtime/ctx_funcs.h

@@ -57,8 +57,10 @@ _HPy_HIDDEN HPy ctx_Module_Create(HPyContext *ctx, HPyModuleDef *hpydef);
 // ctx_object.c
 _HPy_HIDDEN void ctx_Dump(HPyContext *ctx, HPy h);
 _HPy_HIDDEN int ctx_TypeCheck(HPyContext *ctx, HPy h_obj, HPy h_type);
+_HPy_HIDDEN int ctx_TypeCheck_g(HPyContext *ctx, HPy h_obj, HPyGlobal g_type);
 _HPy_HIDDEN int ctx_Type_IsSubtype(HPyContext *ctx, HPy h_sub, HPy h_type);
 _HPy_HIDDEN int ctx_Is(HPyContext *ctx, HPy h_obj, HPy h_other);
+_HPy_HIDDEN int ctx_Is_g(HPyContext *ctx, HPy h_obj, HPyGlobal g_other);
 _HPy_HIDDEN HPy ctx_GetItem_i(HPyContext *ctx, HPy obj, HPy_ssize_t idx);
 _HPy_HIDDEN HPy ctx_GetItem_s(HPyContext *ctx, HPy obj, const char *key);
 _HPy_HIDDEN int ctx_SetItem_i(HPyContext *ctx, HPy obj, HPy_ssize_t idx, HPy value);

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

@@ -309,6 +309,8 @@ struct _HPyContext_s {
     const char *(*ctx_Type_GetName)(HPyContext *ctx, HPy type);
     HPy (*ctx_SeqIter_New)(HPyContext *ctx, HPy seq);
     int (*ctx_Type_CheckSlot)(HPyContext *ctx, HPy type, HPyDef *value);
+    int (*ctx_TypeCheck_g)(HPyContext *ctx, HPy obj, HPyGlobal type);
+    int (*ctx_Is_g)(HPyContext *ctx, HPy obj, HPyGlobal other);
 };
 
 #ifdef GRAALVM_PYTHON_LLVM

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

@@ -436,6 +436,10 @@ HPyAPI_FUNC int HPy_TypeCheck(HPyContext *ctx, HPy obj, HPy type) {
      return ctx->ctx_TypeCheck ( ctx, UNWRAP(obj), UNWRAP(type) );
 }
 
+HPyAPI_FUNC int HPy_TypeCheck_g(HPyContext *ctx, HPy obj, HPyGlobal type) {
+     return ctx->ctx_TypeCheck_g ( ctx, UNWRAP(obj), UNWRAP_GLOBAL(type) );
+}
+
 HPyAPI_FUNC int HPy_SetType(HPyContext *ctx, HPy obj, HPy type) {
      return ctx->ctx_SetType ( ctx, UNWRAP(obj), UNWRAP(type) );
 }
@@ -452,6 +456,10 @@ HPyAPI_FUNC int HPy_Is(HPyContext *ctx, HPy obj, HPy other) {
      return ctx->ctx_Is ( ctx, UNWRAP(obj), UNWRAP(other) );
 }
 
+HPyAPI_FUNC int HPy_Is_g(HPyContext *ctx, HPy obj, HPyGlobal other) {
+     return ctx->ctx_Is_g ( ctx, UNWRAP(obj), UNWRAP_GLOBAL(other) );
+}
+
 HPyAPI_FUNC void *HPy_AsStruct(HPyContext *ctx, HPy h) {
      return ctx->ctx_AsStruct ( ctx, UNWRAP(h) );
 }

graalpython/com.oracle.graal.python.jni/src/debug/autogen_debug_ctx_init.h

@@ -127,10 +127,12 @@ int debug_ctx_SetItem_i(HPyContext *dctx, DHPy obj, HPy_ssize_t idx, DHPy value)
 int debug_ctx_SetItem_s(HPyContext *dctx, DHPy obj, const char *key, DHPy value);
 DHPy debug_ctx_Type(HPyContext *dctx, DHPy obj);
 int debug_ctx_TypeCheck(HPyContext *dctx, DHPy obj, DHPy type);
+int debug_ctx_TypeCheck_g(HPyContext *dctx, DHPy obj, HPyGlobal type);
 int debug_ctx_SetType(HPyContext *dctx, DHPy obj, DHPy type);
 int debug_ctx_Type_IsSubtype(HPyContext *dctx, DHPy sub, DHPy type);
 const char *debug_ctx_Type_GetName(HPyContext *dctx, DHPy type);
 int debug_ctx_Is(HPyContext *dctx, DHPy obj, DHPy other);
+int debug_ctx_Is_g(HPyContext *dctx, DHPy obj, HPyGlobal other);
 void *debug_ctx_AsStruct(HPyContext *dctx, DHPy h);
 void *debug_ctx_AsStructLegacy(HPyContext *dctx, DHPy h);
 DHPy debug_ctx_New(HPyContext *dctx, DHPy h_type, void **data);
@@ -384,10 +386,12 @@ static inline void debug_ctx_init_fields(HPyContext *dctx, HPyContext *uctx)
     dctx->ctx_SetItem_s = &debug_ctx_SetItem_s;
     dctx->ctx_Type = &debug_ctx_Type;
     dctx->ctx_TypeCheck = &debug_ctx_TypeCheck;
+    dctx->ctx_TypeCheck_g = &debug_ctx_TypeCheck_g;
     dctx->ctx_SetType = &debug_ctx_SetType;
     dctx->ctx_Type_IsSubtype = &debug_ctx_Type_IsSubtype;
     dctx->ctx_Type_GetName = &debug_ctx_Type_GetName;
     dctx->ctx_Is = &debug_ctx_Is;
+    dctx->ctx_Is_g = &debug_ctx_Is_g;
     dctx->ctx_AsStruct = &debug_ctx_AsStruct;
     dctx->ctx_AsStructLegacy = &debug_ctx_AsStructLegacy;
     dctx->ctx_New = &debug_ctx_New;

graalpython/com.oracle.graal.python.jni/src/debug/autogen_debug_wrappers.c

@@ -486,6 +486,11 @@ int debug_ctx_TypeCheck(HPyContext *dctx, DHPy obj, DHPy type)
     return HPy_TypeCheck(get_info(dctx)->uctx, DHPy_unwrap(dctx, obj), DHPy_unwrap(dctx, type));
 }
 
+int debug_ctx_TypeCheck_g(HPyContext *dctx, DHPy obj, HPyGlobal type)
+{
+    return HPy_TypeCheck_g(get_info(dctx)->uctx, DHPy_unwrap(dctx, obj), type);
+}
+
 int debug_ctx_SetType(HPyContext *dctx, DHPy obj, DHPy type)
 {
     return HPy_SetType(get_info(dctx)->uctx, DHPy_unwrap(dctx, obj), DHPy_unwrap(dctx, type));
@@ -506,6 +511,11 @@ int debug_ctx_Is(HPyContext *dctx, DHPy obj, DHPy other)
     return HPy_Is(get_info(dctx)->uctx, DHPy_unwrap(dctx, obj), DHPy_unwrap(dctx, other));
 }
 
+int debug_ctx_Is_g(HPyContext *dctx, DHPy obj, HPyGlobal other)
+{
+    return HPy_Is_g(get_info(dctx)->uctx, DHPy_unwrap(dctx, obj), other);
+}
+
 void *debug_ctx_AsStruct(HPyContext *dctx, DHPy h)
 {
     return HPy_AsStruct(get_info(dctx)->uctx, DHPy_unwrap(dctx, h));