Report legacy built-in shape for native C API classes

Author: fangerer

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

@@ -2246,8 +2246,7 @@ static Object doGeneric(GraalHPyContext hpyContext, Object type, Object dataOutV
                         @Cached PythonObjectFactory factory,
                         @Cached PCallHPyFunction callMallocNode,
                         @Cached PCallHPyFunction callWriteDataNode,
-                        @Cached InlinedExactClassProfile classProfile,
-                        @Cached ReadAttributeFromObjectNode readAttributeFromObjectNode) {
+                        @Cached InlinedExactClassProfile classProfile) {
 
             Object profiledTypeObject = classProfile.profile(inliningTarget, type);
 
@@ -2278,7 +2277,7 @@ static Object doGeneric(GraalHPyContext hpyContext, Object type, Object dataOutV
                 defaultCallFunc = clazz.getHPyDefaultCallFunc();
             }
 
-            int builtinShape = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(profiledTypeObject, readAttributeFromObjectNode);
+            int builtinShape = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(profiledTypeObject);
             PythonObject pythonObject = createFromBuiltinShape(builtinShape, profiledTypeObject, dataPtr, factory);
 
             if (destroyFunc != null) {
@@ -2340,8 +2339,7 @@ static Object doGeneric(GraalHPyContext hpyContext, Object type, Object args, lo
                         @Bind("this") Node inliningTarget,
                         @Cached PythonObjectFactory factory,
                         @Cached PCallHPyFunction callMallocNode,
-                        @Cached InlinedExactClassProfile classProfile,
-                        @Cached ReadAttributeFromObjectNode readAttributeFromObjectNode) {
+                        @Cached InlinedExactClassProfile classProfile) {
 
             Object profiledTypeObject = classProfile.profile(inliningTarget, type);
             Object dataPtr = null;
@@ -2361,7 +2359,7 @@ static Object doGeneric(GraalHPyContext hpyContext, Object type, Object args, lo
                 }
             }
 
-            int builtinShape = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(profiledTypeObject, readAttributeFromObjectNode);
+            int builtinShape = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(profiledTypeObject);
             PythonObject pythonObject = GraalHPyNew.createFromBuiltinShape(builtinShape, type, dataPtr, factory);
 
             if (destroyFunc != null) {
@@ -3618,10 +3616,9 @@ public abstract static class GraalHPyTypeGetBuiltinShape extends HPyBinaryContex
         static int doGeneric(@SuppressWarnings("unused") Object hpyContext, Object typeObject,
                         @Bind("this") Node inliningTarget,
                         @Cached InlinedExactClassProfile classProfile,
-                        @Cached ReadAttributeFromObjectNode readAttributeFromObjectNode,
                         @Cached PRaiseNode raiseNode) {
             Object profiledTypeObject = classProfile.profile(inliningTarget, typeObject);
-            int result = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(profiledTypeObject, readAttributeFromObjectNode);
+            int result = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(profiledTypeObject);
             if (result == -2) {
                 throw raiseNode.raise(TypeError, ErrorMessages.S_MUST_BE_S, "arg", "type");
             }

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

@@ -115,13 +115,13 @@
 import java.util.Arrays;
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtContext;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContext.LLVMType;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyNew;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
+import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsTypeNode;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.object.HiddenKey;
@@ -508,9 +508,12 @@ public static boolean isValidBuiltinShape(int i) {
         return HPyType_BUILTIN_SHAPE_LEGACY <= i && i <= HPyType_BUILTIN_SHAPE_LIST;
     }
 
-    public static int getBuiltinShapeFromHiddenAttribute(Object object, ReadAttributeFromObjectNode readNode) {
+    public static int getBuiltinShapeFromHiddenAttribute(Object object) {
         if (object instanceof PythonClass pythonClass) {
             return pythonClass.getBuiltinShape();
+        } else if (object instanceof PythonAbstractNativeObject) {
+            assert IsTypeNode.getUncached().execute(object);
+            return HPyType_BUILTIN_SHAPE_LEGACY;
         }
         return -2; // error
     }

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

@@ -2575,7 +2575,7 @@ Object doGeneric(GraalHPyContext context, Object typeSpec, Object typeSpecParamA
                     Object baseFlagsObj = readHPyTypeFlagsNode.execute(baseClass, GraalHPyDef.TYPE_HPY_FLAGS);
                     baseFlags = baseFlagsObj != PNone.NO_VALUE ? (long) baseFlagsObj : 0;
                 }
-                int baseBuiltinShape = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(baseClass, readHPyTypeFlagsNode);
+                int baseBuiltinShape = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(baseClass);
                 checkInheritanceConstraints(flags, baseFlags, builtinShape, baseBuiltinShape > GraalHPyDef.HPyType_BUILTIN_SHAPE_LEGACY, raiseNode);
                 return newType;
             } catch (CannotCastException | InteropException e) {

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

@@ -2265,7 +2265,7 @@ public int ctxTypeGetBuiltinShape(long h_type) {
         increment(HPyJNIUpcall.HPyTypeGetBuiltinShape);
         assert GraalHPyBoxing.isBoxedHandle(h_type);
         Object typeObject = context.bitsAsPythonObject(h_type);
-        int result = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(typeObject, ReadAttributeFromObjectNode.getUncachedForceType());
+        int result = GraalHPyDef.getBuiltinShapeFromHiddenAttribute(typeObject);
         if (result == -2) {
             return HPyRaiseNode.raiseIntUncached(context, -2, TypeError, ErrorMessages.S_MUST_BE_S, "arg", "type");
         }