make PythonObject.storage field final

Author: lukasstadler

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonBuiltinObject.java

@@ -43,7 +43,6 @@ public abstract class PythonBuiltinObject extends PythonObject {
 
     public PythonBuiltinObject(PythonClass cls) {
         super(cls);
-        assert cls != null : getClass().getSimpleName();
     }
 
     private boolean isBuiltin() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

@@ -40,7 +40,6 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Location;
@@ -49,23 +48,24 @@
 
 public class PythonObject extends PythonAbstractObject {
     protected final PythonClass pythonClass;
-    @CompilationFinal protected DynamicObject storage;
+    protected final DynamicObject storage;
     private PDict dict;
 
     public PythonObject(PythonClass pythonClass) {
+        assert pythonClass != null : getClass().getSimpleName();
+        this.pythonClass = pythonClass;
+        storage = pythonClass.getInstanceShape().newInstance();
+    }
+
+    public PythonObject(PythonClass pythonClass, Shape instanceShape) {
         if (pythonClass == null) {
             CompilerDirectives.transferToInterpreter();
             // special case for base type class
             assert this instanceof PythonBuiltinClass;
             this.pythonClass = (PythonClass) this;
         } else {
             this.pythonClass = pythonClass;
-            storage = pythonClass.getInstanceShape().newInstance();
         }
-    }
-
-    public PythonObject(PythonClass pythonClass, Shape instanceShape) {
-        this.pythonClass = pythonClass;
         storage = instanceShape.newInstance();
     }
 

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

@@ -73,7 +73,7 @@ public final boolean isBuiltin() {
 
     @TruffleBoundary
     public PythonClass(PythonClass typeClass, String name, PythonClass... baseClasses) {
-        super(typeClass);
+        super(typeClass, freshShape() /* do not inherit layout from the TypeClass */);
         this.className = name;
         this.lookupStableAssumption = new CyclicAssumption(className);
 
@@ -89,8 +89,6 @@ public PythonClass(PythonClass typeClass, String name, PythonClass... baseClasse
         // Compute MRO
         computeMethodResolutionOrder();
 
-        // do not inherit layout from the TypeClass.
-        storage = freshShape().newInstance();
         setAttribute(__NAME__, getBaseName(name));
         setAttribute(__QUALNAME__, className);
         setAttribute(__DOC__, PNone.NONE);