Also provide NFI callback for ctx_From/AsPyObject

fangerer · fangerer · commit 1bf578b9dfa7 · 2021-06-30T08:57:06.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/hpy/hpy.c b/graalpython/com.oracle.graal.python.cext/hpy/hpy.c
@@ -1179,14 +1179,15 @@ HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Tuple_FromArray)(HPyContext ctx, _HPyPtr items
 
 HPyAPI_STORAGE HPy _HPy_IMPL_NAME_NOPREFIX(FromPyObject)(HPyContext ctx, cpy_PyObject *obj)
 {
-	UPCALL_VOID(ctx_Err_SetString, ctx, UNWRAP(g_universal_ctx->h_SyntaxError), "API function 'ctx_FromPyObject not supported in ABI compatibility mode");
-	return HPy_NULL;
+	/* Although, this operation is not supported for in ABI compatibility mode, we still
+	   need to implement the callback properly because it might still be a valid path
+	   in other modes. */
+	return UPCALL_HPY(ctx_FromPyObject, ctx, obj);
 }
 
 HPyAPI_STORAGE cpy_PyObject *_HPy_IMPL_NAME_NOPREFIX(AsPyObject)(HPyContext ctx, HPy h)
 {
-	UPCALL_VOID(ctx_Err_SetString, ctx, UNWRAP(g_universal_ctx->h_SyntaxError), "API function 'ctx_AsPyObject not supported in ABI compatibility mode");
-	return NULL;
+	return (cpy_PyObject *) UPCALL_CHARPTR(ctx_AsPyObject, ctx, h);
 }
 
 HPyAPI_STORAGE HPyListBuilder _HPy_IMPL_NAME(ListBuilder_New)(HPyContext ctx, HPy_ssize_t initial_size) {

Original file line number	Diff line number	Diff line change
`@@ -1179,14 +1179,15 @@ HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Tuple_FromArray)(HPyContext ctx, _HPyPtr items`
`1179`	`1179`
`1180`	`1180`	`HPyAPI_STORAGE HPy _HPy_IMPL_NAME_NOPREFIX(FromPyObject)(HPyContext ctx, cpy_PyObject *obj)`
`1181`	`1181`	`{`
`1182`		`- UPCALL_VOID(ctx_Err_SetString, ctx, UNWRAP(g_universal_ctx->h_SyntaxError), "API function 'ctx_FromPyObject not supported in ABI compatibility mode");`
`1183`		`- return HPy_NULL;`
	`1182`	`+ /* Although, this operation is not supported for in ABI compatibility mode, we still`
	`1183`	`+ need to implement the callback properly because it might still be a valid path`
	`1184`	`+ in other modes. */`
	`1185`	`+ return UPCALL_HPY(ctx_FromPyObject, ctx, obj);`
`1184`	`1186`	`}`
`1185`	`1187`
`1186`	`1188`	`HPyAPI_STORAGE cpy_PyObject *_HPy_IMPL_NAME_NOPREFIX(AsPyObject)(HPyContext ctx, HPy h)`
`1187`	`1189`	`{`
`1188`		`- UPCALL_VOID(ctx_Err_SetString, ctx, UNWRAP(g_universal_ctx->h_SyntaxError), "API function 'ctx_AsPyObject not supported in ABI compatibility mode");`
`1189`		`- return NULL;`
	`1190`	`+ return (cpy_PyObject *) UPCALL_CHARPTR(ctx_AsPyObject, ctx, h);`
`1190`	`1191`	`}`
`1191`	`1192`
`1192`	`1193`	`HPyAPI_STORAGE HPyListBuilder _HPy_IMPL_NAME(ListBuilder_New)(HPyContext ctx, HPy_ssize_t initial_size) {`