use the instanceShape from the PythonBuiltinClassType for PythonBuiltinClass

Author: timfel

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

@@ -46,7 +46,7 @@ public final class PythonBuiltinClass extends PythonManagedClass {
     private final PythonBuiltinClassType type;
 
     public PythonBuiltinClass(PythonBuiltinClassType builtinClass, PythonAbstractClass base) {
-        super(PythonBuiltinClassType.PythonClass, PythonBuiltinClassType.PythonClass.newInstance(), builtinClass.getQualifiedName(), base);
+        super(PythonBuiltinClassType.PythonClass, PythonBuiltinClassType.PythonClass.newInstance(), builtinClass.getInstanceShape(), builtinClass.getQualifiedName(), base);
         this.type = builtinClass;
     }
 

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

@@ -47,7 +47,7 @@
 public final class PythonClass extends PythonManagedClass {
 
     public PythonClass(LazyPythonClass typeClass, DynamicObject storage, String name, PythonAbstractClass[] baseClasses) {
-        super(typeClass, storage, name, baseClasses);
+        super(typeClass, storage, null, name, baseClasses);
     }
 
     @ExportMessage

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

@@ -65,7 +65,7 @@ public abstract class PythonManagedClass extends PythonObject implements PythonA
     @CompilationFinal private Object sulongType;
 
     @TruffleBoundary
-    public PythonManagedClass(LazyPythonClass typeClass, DynamicObject storage, String name, PythonAbstractClass... baseClasses) {
+    protected PythonManagedClass(LazyPythonClass typeClass, DynamicObject storage, Shape instanceShape, String name, PythonAbstractClass... baseClasses) {
         super(typeClass, storage);
         this.className = name;
 
@@ -86,11 +86,15 @@ public PythonManagedClass(LazyPythonClass typeClass, DynamicObject storage, Stri
         setAttribute(__NAME__, getBaseName(name));
         setAttribute(__QUALNAME__, className);
         setAttribute(__DOC__, PNone.NONE);
-        // provide our instances with a fresh shape tree
-        if (PythonLanguage.getCurrent().singleContextAssumption.isValid()) {
-            this.instanceShape = PythonObject.freshShape(this);
+        if (instanceShape != null) {
+            this.instanceShape = instanceShape;
         } else {
-            this.instanceShape = PythonObject.freshShape();
+            // provide our instances with a fresh shape tree
+            if (PythonLanguage.getCurrent().singleContextAssumption.isValid()) {
+                this.instanceShape = PythonObject.freshShape(this);
+            } else {
+                this.instanceShape = PythonObject.freshShape();
+            }
         }
     }