Fix infinte PE-recursion in getting dictoffset

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -310,7 +310,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
                     When called, it accepts no arguments and returns a new featureless
                     instance that has no instance attributes and cannot be given any.
                     """)),
-    PythonClass("type", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(TypeBuiltins.SLOTS).doc("""
+    PythonClass("type", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict(264).slots(TypeBuiltins.SLOTS).doc("""
                     type(object) -> the object's type
                     type(name, bases, dict, **kwds) -> a new type""")),
     PArray("array", PythonObject, newBuilder().publishInModule("array").basetype().slots(ArrayBuiltins.SLOTS)),
@@ -361,7 +361,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
                       - any object implementing the buffer API.
                       - an integer""")),
     PCell("cell", PythonObject, newBuilder().slots(CellBuiltins.SLOTS)),
-    PSimpleNamespace("SimpleNamespace", PythonObject, newBuilder().publishInModule("types").basetype().addDict().slots(SimpleNamespaceBuiltins.SLOTS).doc("""
+    PSimpleNamespace("SimpleNamespace", PythonObject, newBuilder().publishInModule("types").basetype().addDict(16).slots(SimpleNamespaceBuiltins.SLOTS).doc("""
                     A simple attribute-based namespace.
 
                     SimpleNamespace(**kwargs)""")),
@@ -405,7 +405,7 @@ This is equivalent to (real + imag*1j) where imag defaults to 0.""")),
                     dict(**kwargs) -> new dictionary initialized with the name=value pairs
                         in the keyword argument list.  For example:  dict(one=1, two=2)""")),
     PDefaultDict(J_DEFAULTDICT, PDict, newBuilder().moduleName("collections").publishInModule("_collections").basetype().slots(DefaultDictBuiltins.SLOTS)),
-    POrderedDict(J_ORDERED_DICT, PDict, newBuilder().publishInModule("_collections").basetype().addDict().slots(OrderedDictBuiltins.SLOTS)),
+    POrderedDict(J_ORDERED_DICT, PDict, newBuilder().publishInModule("_collections").basetype().addDict(96).slots(OrderedDictBuiltins.SLOTS)),
     PDictItemIterator(J_DICT_ITEMITERATOR, PythonObject, newBuilder().disallowInstantiation().slots(IteratorBuiltins.SLOTS)),
     PDictReverseItemIterator(J_DICT_REVERSE_ITEMITERATOR, PythonObject, newBuilder().slots(IteratorBuiltins.SLOTS)),
     PDictItemsView(J_DICT_ITEMS, PythonObject, newBuilder().disallowInstantiation().slots(DictViewBuiltins.SLOTS, DictReprBuiltin.SLOTS)),
@@ -579,7 +579,7 @@ or repr(object).
                     If iterable is specified the tuple is initialized from iterable's items.
 
                     If the argument is a tuple, the return value is the same object.""")),
-    PythonModule("module", PythonObject, newBuilder().basetype().addDict().slots(ModuleBuiltins.SLOTS).doc("""
+    PythonModule("module", PythonObject, newBuilder().basetype().addDict(16).slots(ModuleBuiltins.SLOTS).doc("""
                     Create a module object.
 
                     The name must be a string; the optional doc argument can have any type.""")),
@@ -624,7 +624,7 @@ passed as positional arguments to zip().  The i-th element in every tuple
     PSemLock("SemLock", PythonObject, newBuilder().publishInModule("_multiprocessing").basetype().slots(SemLockBuiltins.SLOTS)),
     PGraalPySemLock("SemLock", PythonObject, newBuilder().publishInModule("_multiprocessing_graalpy").basetype().slots(GraalPySemLockBuiltins.SLOTS)),
     PSocket("socket", PythonObject, newBuilder().publishInModule(J__SOCKET).basetype().slots(SocketBuiltins.SLOTS)),
-    PStaticmethod("staticmethod", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(StaticmethodBuiltins.SLOTS).doc("""
+    PStaticmethod("staticmethod", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict(24).slots(StaticmethodBuiltins.SLOTS).doc("""
                     staticmethod(function) -> method
 
                     Convert a function to be a static method.
@@ -643,7 +643,7 @@ It can be called either on the class (e.g. C.f()) or on an instance
 
                     Static methods in Python are similar to those found in Java or C++.
                     For a more advanced concept, see the classmethod builtin.""")),
-    PClassmethod("classmethod", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(ClassmethodCommonBuiltins.SLOTS, ClassmethodBuiltins.SLOTS).doc("""
+    PClassmethod("classmethod", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict(24).slots(ClassmethodCommonBuiltins.SLOTS, ClassmethodBuiltins.SLOTS).doc("""
                     classmethod(function) -> method
 
                     Convert a function to be a class method.
@@ -715,7 +715,7 @@ It can be called either on the class (e.g. C.f()) or on an instance
     // Errors and exceptions:
 
     // everything after BaseException is considered to be an exception
-    PBaseException("BaseException", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(BaseExceptionBuiltins.SLOTS).doc("""
+    PBaseException("BaseException", PythonObject, newBuilder().publishInModule(J_BUILTINS).basetype().addDict(16).slots(BaseExceptionBuiltins.SLOTS).doc("""
                     Common base class for all exceptions""")),
     PBaseExceptionGroup("BaseExceptionGroup", PBaseException, newBuilder().publishInModule(J_BUILTINS).basetype().addDict().slots(BaseExceptionGroupBuiltins.SLOTS).doc("""
                     A combination of multiple unrelated exceptions.""")),
@@ -1440,6 +1440,7 @@ private static final class TypeBuilder {
         private boolean basetype;
         private boolean heaptype;
         private boolean addDict;
+        private int dictoffset;
         private boolean disallowInstantiation;
         private TpSlots slots;
         private String doc;
@@ -1472,6 +1473,12 @@ public TypeBuilder addDict() {
             return this;
         }
 
+        public TypeBuilder addDict(int dictoffset) {
+            this.addDict = true;
+            this.dictoffset = dictoffset;
+            return this;
+        }
+
         public TypeBuilder disallowInstantiation() {
             this.disallowInstantiation = true;
             return this;
@@ -1507,6 +1514,7 @@ public TypeBuilder doc(String doc) {
     private final TruffleString printName;
     private final boolean basetype;
     private final boolean isBuiltinWithDict;
+    private final int dictoffset;
     private final boolean disallowInstantiation;
     private final TruffleString doc;
 
@@ -1536,6 +1544,13 @@ public TypeBuilder doc(String doc) {
         }
         this.basetype = builder.basetype;
         this.isBuiltinWithDict = builder.addDict;
+        int dictoffset = 0;
+        if (builder.dictoffset != 0) {
+            dictoffset = builder.dictoffset;
+        } else if (base != null) {
+            dictoffset = base.dictoffset;
+        }
+        this.dictoffset = dictoffset;
         this.weaklistoffset = -1;
         this.declaredSlots = builder.slots != null ? builder.slots : TpSlots.createEmpty();
         boolean disallowInstantiation = builder.disallowInstantiation;
@@ -1582,6 +1597,10 @@ public boolean isBuiltinWithDict() {
         return isBuiltinWithDict;
     }
 
+    public int getDictoffset() {
+        return dictoffset;
+    }
+
     public boolean disallowInstantiation() {
         return disallowInstantiation;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

@@ -2636,26 +2636,12 @@ public static long executeUncached(Object cls) {
         static long lookup(Object cls,
                         @Cached(inline = false) GetTypeFlagsNode getTypeFlagsNode,
                         @Cached(inline = false) CExtNodes.LookupNativeI64MemberFromBaseNode lookup) {
-            long result = lookup.execute(cls, PyTypeObject__tp_dictoffset, DICTOFFSET, GetDictOffsetNode::getBuiltinDictoffset);
+            long result = lookup.execute(cls, PyTypeObject__tp_dictoffset, DICTOFFSET, PythonBuiltinClassType::getDictoffset);
             if (result == 0 && (getTypeFlagsNode.execute(cls) & TypeFlags.MANAGED_DICT) != 0) {
                 return MANAGED_DICT_OFFSET;
             }
             return result;
         }
-
-        private static int getBuiltinDictoffset(PythonBuiltinClassType cls) {
-            if (!cls.isBuiltinWithDict()) {
-                return 0;
-            }
-            // TODO there are more builtins with dict
-            return switch (cls) {
-                case PBaseException, PythonModule, PSimpleNamespace -> 16;
-                case PythonClass -> 264;
-                case PStaticmethod, PClassmethod -> 24;
-                case POrderedDict -> 96;
-                default -> cls.getBase() != null ? getBuiltinDictoffset(cls.getBase()) : 0;
-            };
-        }
     }
 
     @GenerateUncached