Return default value 0 for basicsize, itemsize, and dictoffset.

Author: fangerer

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

@@ -503,32 +503,35 @@ Object doTpHash(ManagedPythonClass object, @SuppressWarnings("unused") String ke
 
         @Specialization(guards = "eq(TP_BASICSIZE, key)")
         Object doTpBasicsize(ManagedPythonClass object, @SuppressWarnings("unused") String key,
+                        @Cached("create()") CastToIndexNode castToIntNode,
                         @Cached("create(__BASICSIZE__)") GetFixedAttributeNode getAttrNode) {
-            return getAttrNode.executeObject(object);
+            Object val = getAttrNode.executeObject(object);
+            return val != PNone.NO_VALUE ? castToIntNode.execute(val) : 0L;
         }
 
         @Specialization(guards = "eq(TP_ITEMSIZE, key)")
-        Object doTpItemsize(ManagedPythonClass object, @SuppressWarnings("unused") String key,
+        long doTpItemsize(ManagedPythonClass object, @SuppressWarnings("unused") String key,
+                        @Cached("create()") CastToIndexNode castToIntNode,
                         @Cached("create(__ITEMSIZE__)") GetFixedAttributeNode getAttrNode) {
             Object val = getAttrNode.executeObject(object);
             // If the attribute does not exist, this means that we take 'tp_itemsize' from the base
             // object which is by default 0 (see typeobject.c:PyBaseObject_Type).
             if (val == PNone.NO_VALUE) {
                 return 0L;
             }
-            return val;
+            return val != PNone.NO_VALUE ? castToIntNode.execute(val) : 0L;
         }
 
         @Specialization(guards = "eq(TP_DICTOFFSET, key)")
-        Object doTpDictoffset(ManagedPythonClass object, @SuppressWarnings("unused") String key,
+        long doTpDictoffset(ManagedPythonClass object, @SuppressWarnings("unused") String key,
                         @Cached("create()") CastToIndexNode castToIntNode,
                         @Cached("create(__DICTOFFSET__)") GetFixedAttributeNode getAttrNode) {
             // TODO properly implement 'tp_dictoffset' for builtin classes
             if (object instanceof PythonBuiltinClass) {
                 return 0L;
             }
             Object dictoffset = getAttrNode.executeObject(object);
-            return castToIntNode.execute(dictoffset);
+            return dictoffset != PNone.NO_VALUE ? castToIntNode.execute(dictoffset) : 0L;
         }
 
         @Specialization(guards = "eq(TP_WEAKLISTOFFSET, key)")