Remove PythonBuiltinClassType#type field

Author: timfel

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

@@ -1473,7 +1473,6 @@ public TypeBuilder doc(String doc) {
     private final TruffleString doc;
 
     // initialized in static constructor
-    @CompilationFinal private PythonBuiltinClassType type;
     @CompilationFinal private int weaklistoffset;
 
     /**
@@ -1539,10 +1538,6 @@ public TruffleString getPrintName() {
         return printName;
     }
 
-    public PythonBuiltinClassType getType() {
-        return type;
-    }
-
     public PythonBuiltinClassType getBase() {
         return base;
     }
@@ -1596,31 +1591,14 @@ public final Shape getInstanceShape(PythonLanguage lang) {
     @CompilationFinal(dimensions = 1) public static final PythonBuiltinClassType[] VALUES = Arrays.copyOf(values(), values().length);
 
     static {
-        PythonObject.type = PythonClass;
-
         boolean assertionsEnabled = false;
         assert (assertionsEnabled = true) == true;
         HashSet<String> set = assertionsEnabled ? new HashSet<>() : null;
         for (PythonBuiltinClassType type : VALUES) {
             // check uniqueness
             assert set.add("" + type.moduleName + "." + type.name) : type.name();
-
-            /*
-             * Now the only way base can still be null is if type is PythonObject.
-             */
-            if (type.type == null && type.base != null) {
-                type.type = type.base.type;
-            }
-
             type.weaklistoffset = WeakRefModuleBuiltins.getBuiltinTypeWeaklistoffset(type);
         }
-
-        // Finally, we set all remaining types to PythonClass.
-        for (PythonBuiltinClassType type : VALUES) {
-            if (type.type == null) {
-                type.type = PythonClass;
-            }
-        }
     }
 
     /**

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

@@ -67,7 +67,8 @@ public final class PythonBuiltinClass extends PythonManagedClass {
 
     @TruffleBoundary
     public PythonBuiltinClass(PythonLanguage lang, PythonBuiltinClassType builtinClass, PythonAbstractClass base) {
-        super(null, lang, builtinClass.getType(), builtinClass.getType().getInstanceShape(lang), builtinClass.getInstanceShape(lang), builtinClass.getName(), base, new PythonAbstractClass[]{base},
+        super(null, lang, PythonBuiltinClassType.PythonClass, PythonBuiltinClassType.PythonClass.getInstanceShape(lang), builtinClass.getInstanceShape(lang), builtinClass.getName(), base,
+                        new PythonAbstractClass[]{base},
                         builtinClass.getSlots());
         this.type = builtinClass;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetClassNode.java

@@ -173,7 +173,7 @@ static Object doNativeObject(Node inliningTarget, PythonAbstractNativeObject obj
 
     @Specialization
     static Object getPBCT(PythonBuiltinClassType object) {
-        return object.getType();
+        return PythonBuiltinClassType.PythonClass;
     }
 
     @Specialization