Merge ExtLayoutStrategy into LayoutStrategy.

Remove ExtDefaultStrategy.
Make ExtAllocator final.

Author: woess

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ExtAllocator.java

@@ -74,15 +74,11 @@
 
 import sun.misc.Unsafe;
 
-abstract class ExtAllocator extends BaseAllocator {
+final class ExtAllocator extends BaseAllocator {
 
     /** Placeholder for when no value is available or no type speculation should be performed. */
     private static final Object NO_VALUE = new Object();
 
-    ExtAllocator(LayoutImpl layout) {
-        super(layout);
-    }
-
     ExtAllocator(ShapeImpl shape) {
         super(shape);
     }
@@ -405,7 +401,7 @@ public Location locationForValue(Object value) {
         return locationForValue(value, 0);
     }
 
-    protected Location locationForValue(Object value, int putFlags) {
+    Location locationForValue(Object value, int putFlags) {
         if (Flags.isConstant(putFlags)) {
             return constantLocation(value);
         } else if (Flags.isDeclaration(putFlags)) {

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ExtDefaultStrategy.java

@@ -60,14 +60,12 @@
 
 final class ExtLayout extends LayoutImpl {
 
-    private final ExtLayoutStrategy strategy;
     private final List<FieldInfo> objectFields;
     private final List<FieldInfo> primitiveFields;
     private final int primitiveFieldMaxSize;
 
-    ExtLayout(Class<? extends DynamicObject> dynamicObjectClass, ExtLayoutStrategy strategy, LayoutInfo layoutInfo, int allowedImplicitCasts) {
+    ExtLayout(Class<? extends DynamicObject> dynamicObjectClass, LayoutStrategy strategy, LayoutInfo layoutInfo, int allowedImplicitCasts) {
         super(dynamicObjectClass, strategy, allowedImplicitCasts);
-        this.strategy = strategy;
 
         this.objectFields = layoutInfo.objectFields;
         this.primitiveFields = layoutInfo.primitiveFields;
@@ -79,7 +77,7 @@ private static LayoutInfo getOrCreateLayoutInfo(Class<? extends DynamicObject> d
         return LayoutInfo.getOrCreateNewLayoutInfo(dynamicObjectClass, layoutLookup);
     }
 
-    private static ExtLayout getOrCreateLayout(Class<? extends DynamicObject> clazz, Lookup layoutLookup, int implicitCastFlags, ExtLayoutStrategy strategy) {
+    private static ExtLayout getOrCreateLayout(Class<? extends DynamicObject> clazz, Lookup layoutLookup, int implicitCastFlags, LayoutStrategy strategy) {
         Objects.requireNonNull(clazz, "DynamicObject layout class");
         Key key = new Key(clazz, implicitCastFlags, strategy);
         ExtLayout layout = (ExtLayout) LAYOUT_MAP.get(key);
@@ -91,7 +89,7 @@ private static ExtLayout getOrCreateLayout(Class<? extends DynamicObject> clazz,
         return layout == null ? newLayout : layout;
     }
 
-    static ExtLayout createLayoutImpl(Class<? extends DynamicObject> clazz, Lookup layoutLookup, int implicitCastFlags, ExtLayoutStrategy strategy) {
+    static ExtLayout createLayoutImpl(Class<? extends DynamicObject> clazz, Lookup layoutLookup, int implicitCastFlags, LayoutStrategy strategy) {
         return getOrCreateLayout(clazz, layoutLookup, implicitCastFlags, strategy);
     }
 
@@ -159,17 +157,6 @@ protected boolean hasPrimitiveExtensionArray() {
         return true;
     }
 
-    @Override
-    public ShapeImpl.BaseAllocator createAllocator() {
-        ExtLayout layout = this;
-        return getStrategy().createAllocator(layout);
-    }
-
-    @Override
-    public ExtLayoutStrategy getStrategy() {
-        return strategy;
-    }
-
     private static final class LayoutInfo {
 
         final Class<? extends DynamicObject> clazz;

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ExtLayout.java

@@ -49,7 +49,7 @@ abstract class Layout {
 
     public static final String OPTION_PREFIX = "truffle.object.";
 
-    private static final LayoutFactory LAYOUT_FACTORY = new ExtLayoutFactory();
+    private static final LayoutFactory LAYOUT_FACTORY = new LayoutFactory();
 
     static final int INT_TO_DOUBLE_FLAG = 1;
     static final int INT_TO_LONG_FLAG = 2;

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ExtLayoutFactory.java

@@ -48,13 +48,18 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 
-abstract sealed class LayoutFactory permits ExtLayoutFactory {
+@SuppressWarnings("static-method")
+final class LayoutFactory {
 
-    protected abstract void registerLayoutClass(Class<? extends DynamicObject> subclass, Lookup layoutLookup);
+    void registerLayoutClass(Class<? extends DynamicObject> subclass, Lookup layoutLookup) {
+        ExtLayout.registerLayoutClass(subclass, layoutLookup);
+    }
 
-    public abstract LayoutImpl createLayout(Class<? extends DynamicObject> layoutClass, Lookup layoutLookup, int implicitCastFlags);
+    LayoutImpl createLayout(Class<? extends DynamicObject> layoutClass, Lookup layoutLookup, int implicitCastFlags) {
+        return ExtLayout.createLayoutImpl(layoutClass, layoutLookup, implicitCastFlags);
+    }
 
-    public final Shape createShape(Class<? extends DynamicObject> layoutClass,
+    Shape createShape(Class<? extends DynamicObject> layoutClass,
                     int implicitCastFlags,
                     Object dynamicType,
                     Object sharedData,

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ExtLayoutStrategy.java

@@ -89,8 +89,6 @@ public boolean isAllowedIntToLong() {
 
     protected abstract int getPrimitiveFieldCount();
 
-    public abstract ShapeImpl.BaseAllocator createAllocator();
-
     public LayoutStrategy getStrategy() {
         return strategy;
     }