simplify PythonObject constructor

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -1490,7 +1490,7 @@ Object doObjectCachedInstanceShape(PythonManagedClass self, Object[] varargs, PK
             if (varargs.length > 0 || kwargs.length > 0) {
                 // TODO: tfel: this should throw an error only if init isn't overridden
             }
-            return factory().createPythonObject(self, cachedInstanceShape);
+            return factory().createPythonObject(cachedInstanceShape);
         }
 
         @Specialization(guards = "!self.needsNativeAllocation()", replaces = "doObjectCachedInstanceShape")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -125,7 +125,6 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
-import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetInstanceShape;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetTypeFlagsNode;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
@@ -221,7 +220,7 @@ public void initialize(PythonCore core) {
         PythonClass errorHandlerClass = core.factory().createPythonClass(PythonBuiltinClassType.PythonClass, "CErrorHandler",
                         new PythonAbstractClass[]{core.lookupType(PythonBuiltinClassType.PythonObject)});
         builtinConstants.put("CErrorHandler", errorHandlerClass);
-        builtinConstants.put(ERROR_HANDLER, core.factory().createPythonObject(errorHandlerClass, GetInstanceShape.doSlowPath(errorHandlerClass)));
+        builtinConstants.put(ERROR_HANDLER, core.factory().createPythonObject(errorHandlerClass));
         builtinConstants.put(NATIVE_NULL, new PythonNativeNull());
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/UnicodeDataModuleBuiltins.java

@@ -52,7 +52,6 @@
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
-import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetInstanceShape;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -160,7 +159,7 @@ public void initialize(PythonCore core) {
         super.initialize(core);
         builtinConstants.put("version", getUnicodeVersion());
         PythonBuiltinClass objectType = core.lookupType(PythonBuiltinClassType.PythonObject);
-        PythonObject ucd_3_2_0 = core.factory().createPythonObject(objectType, GetInstanceShape.doSlowPath(objectType));
+        PythonObject ucd_3_2_0 = core.factory().createPythonObject(objectType);
         ucd_3_2_0.setAttribute("unidata_version", "3.2.0");
         builtinConstants.put("ucd_3_2_0", ucd_3_2_0); // TODO this is a fake object, just satisfy
                                                       // pip installer import

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

@@ -38,7 +38,6 @@
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
@@ -56,11 +55,7 @@ public PythonObject(LazyPythonClass pythonClass) {
         assert getLazyPythonClass() == pythonClass;
     }
 
-    public PythonObject(LazyPythonClass pythonClass, Shape instanceShape) {
-        if (pythonClass == null) {
-            assert false;
-            CompilerDirectives.transferToInterpreter();
-        }
+    public PythonObject(Shape instanceShape) {
         storage = instanceShape.newInstance();
     }
 

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

@@ -64,10 +64,7 @@ public abstract class PythonManagedClass extends PythonObject implements PythonA
 
     @TruffleBoundary
     public PythonManagedClass(LazyPythonClass typeClass, String name, PythonAbstractClass... baseClasses) {
-        super(typeClass, PythonObject.freshShape(typeClass) /*
-                                                             * do not inherit layout from the
-                                                             * TypeClass
-                                                             */);
+        super(PythonObject.freshShape(typeClass) /* do not inherit layout from the */);
         this.className = name;
 
         this.methodResolutionOrder = new MroSequenceStorage(name, 0);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -177,8 +177,20 @@ public final <T> T trace(T allocatedObject) {
      * Python objects
      */
 
-    public PythonObject createPythonObject(LazyPythonClass cls, Shape instanceShape) {
-        return trace(new PythonObject(cls, instanceShape));
+    /**
+     * Creates a PythonObject for the given class. This is potentially slightly slower than if the
+     * shape had been cached, due to the additional shape lookup.
+     */
+    public PythonObject createPythonObject(LazyPythonClass cls) {
+        return trace(new PythonObject(cls));
+    }
+
+    /**
+     * Creates a Python object with the given shape. Python object shapes store the class in the
+     * ObjectType.
+     */
+    public PythonObject createPythonObject(Shape instanceShape) {
+        return trace(new PythonObject(instanceShape));
     }
 
     public PythonNativeObject createNativeObjectWrapper(TruffleObject obj) {