keep shape roots per-language rather than static so they do not leak

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -38,6 +38,7 @@
 
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.Python3Core;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PEllipsis;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
@@ -89,6 +90,7 @@
 import com.oracle.truffle.api.nodes.ExecutableNode;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
+import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
@@ -142,6 +144,9 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     private final NodeFactory nodeFactory;
     private final ConcurrentHashMap<String, RootCallTarget> builtinCallTargetCache = new ConcurrentHashMap<>();
 
+    private final Shape emptyShape = Shape.newBuilder().allowImplicitCastIntToDouble(false).allowImplicitCastIntToLong(true).shapeFlags(0).propertyAssumptions(true).build();
+    @CompilationFinal(dimensions = 1) private final Shape[] builtinTypeInstanceShapes = new Shape[PythonBuiltinClassType.VALUES.length];
+
     @CompilationFinal(dimensions = 1) private static final Object[] CONTEXT_INSENSITIVE_SINGLETONS = new Object[]{PNone.NONE, PNone.NO_VALUE, PEllipsis.INSTANCE, PNotImplemented.NOT_IMPLEMENTED};
 
     /**
@@ -645,4 +650,20 @@ public RootCallTarget getOrComputeBuiltinCallTarget(Builtin builtin, Class<? ext
         String key = builtin.name() + nodeClass.getName();
         return builtinCallTargetCache.computeIfAbsent(key, (k) -> supplier.apply(builtin));
     }
+
+    public static Shape getEmptyShape() {
+        return getCurrent().emptyShape;
+    }
+
+    public static Shape getBuiltinTypeInstanceShape(PythonBuiltinClassType type) {
+        Shape[] builtinTypeInstanceShapes = getCurrent().builtinTypeInstanceShapes;
+        int ordinal = type.ordinal();
+        Shape shape = builtinTypeInstanceShapes[ordinal];
+        if (shape == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            shape = PythonObject.freshShape(type);
+            builtinTypeInstanceShapes[ordinal] = shape;
+        }
+        return shape;
+    }
 }

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

@@ -36,6 +36,7 @@
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedContext;
@@ -212,7 +213,6 @@ public enum PythonBuiltinClassType implements TruffleObject {
     nil(null);
 
     private final String name;
-    private final Shape instanceShape;
     private final String publicInModule;
     private final String qualifiedName;
     private final boolean basetype;
@@ -228,11 +228,6 @@ public enum PythonBuiltinClassType implements TruffleObject {
         } else {
             qualifiedName = name;
         }
-        if (name != null) {
-            this.instanceShape = com.oracle.graal.python.builtins.objects.object.PythonObject.freshShape(this);
-        } else {
-            this.instanceShape = null;
-        }
         this.basetype = basetype;
     }
 
@@ -275,7 +270,10 @@ public String toString() {
     }
 
     public final Shape getInstanceShape() {
-        return instanceShape;
+        if (name == null) {
+            CompilerDirectives.shouldNotReachHere("incorrect use of Python builtin type marker");
+        }
+        return PythonLanguage.getBuiltinTypeInstanceShape(this);
     }
 
     @CompilationFinal(dimensions = 1) public static final PythonBuiltinClassType[] VALUES = Arrays.copyOf(values(), values().length - 1);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java

@@ -45,12 +45,12 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary.ForEachNode;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary.HashingStorageIterable;
 import com.oracle.graal.python.builtins.objects.function.PArguments.ThreadState;
 import com.oracle.graal.python.builtins.objects.getsetdescriptor.HiddenPythonKey;
-import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.nodes.PGuards;
@@ -84,8 +84,6 @@
 public final class DynamicObjectStorage extends HashingStorage {
     public static final int SIZE_THRESHOLD = 100;
 
-    private static final Shape EMPTY_SHAPE = PythonObject.freshShape();
-
     final DynamicObject store;
     private final MroSequenceStorage mro;
 
@@ -96,7 +94,7 @@ public Store(Shape shape) {
     }
 
     public DynamicObjectStorage() {
-        this(new Store(EMPTY_SHAPE), null);
+        this(new Store(PythonLanguage.getEmptyShape()), null);
     }
 
     public DynamicObjectStorage(DynamicObject store) {
@@ -373,13 +371,13 @@ private static Object runNode(DynamicObjectStorage self, Object key, Object acc,
 
     @ExportMessage
     public HashingStorage clear(@CachedLibrary(limit = "3") DynamicObjectLibrary dylib) {
-        dylib.resetShape(store, EMPTY_SHAPE);
+        dylib.resetShape(store, PythonLanguage.getEmptyShape());
         return this;
     }
 
     @ExportMessage
     public HashingStorage copy(@CachedLibrary(limit = "3") DynamicObjectLibrary dylib) {
-        DynamicObject copy = new Store(EMPTY_SHAPE);
+        DynamicObject copy = new Store(PythonLanguage.getEmptyShape());
         Object[] keys = dylib.getKeyArray(store);
         for (int i = 0; i < keys.length; i++) {
             dylib.put(copy, keys[i], dylib.getOrDefault(store, keys[i], PNone.NO_VALUE));

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

@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
@@ -194,13 +195,11 @@ public static int getCallSiteInlineCacheMaxDepth() {
         return PythonOptions.getCallSiteInlineCacheMaxDepth();
     }
 
-    private static final Shape emptyShape = Shape.newBuilder().allowImplicitCastIntToDouble(false).allowImplicitCastIntToLong(true).shapeFlags(0).propertyAssumptions(true).build();
-
     public static Shape freshShape(Object klass) {
-        return Shape.newBuilder(emptyShape).addConstantProperty(CLASS, klass, 0).build();
+        return Shape.newBuilder(PythonLanguage.getEmptyShape()).addConstantProperty(CLASS, klass, 0).build();
     }
 
     public static Shape freshShape() {
-        return emptyShape;
+        return PythonLanguage.getEmptyShape();
     }
 }