Fix: Use helper to read kind of HPyType_SpecParam

Author: fangerer

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

@@ -264,6 +264,10 @@ HPyMember_FieldType graal_hpy_member_get_type(HPyMember *member_def) {
 
 /* getters for HPyType_SpecParam */
 
+HPyType_SpecParam_Kind graal_hpy_HPyType_SpecParam_get_kind(HPyType_SpecParam *def) {
+	return def->kind;
+}
+
 void* graal_hpy_HPyType_SpecParam_get_object(HPyType_SpecParam *def) {
 	return UNWRAP(def->object);
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNativeSymbol.java

@@ -84,6 +84,7 @@ public enum GraalHPyNativeSymbol implements NativeCExtSymbol {
     GRAAL_HPY_TYPE_SPEC_GET_DEFINES("graal_hpy_type_spec_get_defines"),
     GRAAL_HPY_TYPE_SPEC_GET_LEGECY_SLOTS("graal_hpy_type_spec_get_legacy_slots"),
     GRAAL_HPY_FROM_HPY_TYPE_SPEC_PARAM_ARRAY("graal_hpy_from_HPyType_SpecParam_array"),
+    GRAAL_HPY_TYPE_SPEC_PARAM_GET_KIND("graal_hpy_HPyType_SpecParam_get_kind"),
     GRAAL_HPY_TYPE_SPEC_PARAM_GET_OBJECT("graal_hpy_HPyType_SpecParam_get_object"),
     GRAAL_HPY_MEMBER_GET_TYPE("graal_hpy_member_get_type"),
     GRAAL_HPY_SLOT_GET_SLOT("graal_hpy_slot_get_slot"),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java

@@ -53,6 +53,7 @@
 import static com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNativeSymbol.GRAAL_HPY_MEMBER_GET_TYPE;
 import static com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNativeSymbol.GRAAL_HPY_METH_GET_SIGNATURE;
 import static com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNativeSymbol.GRAAL_HPY_SLOT_GET_SLOT;
+import static com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNativeSymbol.GRAAL_HPY_TYPE_SPEC_PARAM_GET_KIND;
 import static com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNativeSymbol.GRAAL_HPY_TYPE_SPEC_PARAM_GET_OBJECT;
 
 import java.math.BigInteger;
@@ -1810,7 +1811,7 @@ private static PTuple extractBases(GraalHPyContext context, Object typeSpecParam
                 Object specParam = ptrLib.readArrayElement(typeSpecParamArray, i);
                 // TODO(fa): directly read member as soon as this is supported by Sulong.
                 // Currently, we cannot pass struct-by-value via interop.
-                int specParamKind = castToJavaIntNode.execute(ptrLib.readMember(specParam, "kind"));
+                int specParamKind = castToJavaIntNode.execute(callHelperFunctionNode.call(context, GRAAL_HPY_TYPE_SPEC_PARAM_GET_KIND, specParam));
                 Object specParamObject = asPythonObjectNode.execute(context, callHelperFunctionNode.call(context, GRAAL_HPY_TYPE_SPEC_PARAM_GET_OBJECT, specParam));
 
                 switch (specParamKind) {