Collapse Shape class hierarchy.

Author: woess

truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/DOTestAsserts.java

@@ -49,9 +49,11 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.junit.Assert;
 
@@ -71,7 +73,9 @@ public static <T> T invokeGetter(String methodName, Object receiver) {
     @SuppressWarnings("unchecked")
     public static <T> T invokeMethod(String methodName, Object receiver, Object... args) {
         try {
-            Method method = Arrays.stream(receiver.getClass().getMethods()).filter(m -> m.getName().equals(methodName)).findFirst().get();
+            Method method = Stream.concat(Arrays.stream(receiver.getClass().getMethods()), Arrays.stream(receiver.getClass().getDeclaredMethods())).filter(
+                            m -> m.getName().equals(methodName)).findFirst().orElseThrow(
+                                            () -> new NoSuchElementException("Method " + methodName + " not found in " + receiver.getClass()));
             method.setAccessible(true);
             return (T) method.invoke(receiver, args);
         } catch (IllegalAccessException | InvocationTargetException e) {

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

@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.api.object;
+
+abstract sealed class BaseAllocator implements LocationImpl.LocationVisitor permits ExtAllocator {
+    protected final LayoutImpl layout;
+    protected int objectArraySize;
+    protected int objectFieldSize;
+    protected int primitiveFieldSize;
+    protected int primitiveArraySize;
+    protected int depth;
+    protected boolean shared;
+
+    protected BaseAllocator(LayoutImpl layout) {
+        this.layout = layout;
+    }
+
+    protected BaseAllocator(Shape shape) {
+        this(shape.getLayout());
+        this.objectArraySize = shape.getObjectArraySize();
+        this.objectFieldSize = shape.getObjectFieldSize();
+        this.primitiveFieldSize = shape.getPrimitiveFieldSize();
+        this.primitiveArraySize = shape.getPrimitiveArraySize();
+        this.depth = shape.getDepth();
+        this.shared = shape.isShared();
+    }
+
+    protected abstract Location moveLocation(Location oldLocation);
+
+    /**
+     * Creates a new location from a constant value. The value is stored in the shape rather than in
+     * the object.
+     *
+     * @param value the constant value
+     */
+    public Location constantLocation(Object value) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a new declared location with a default value. A declared location only assumes a type
+     * after the first set (initialization).
+     * <p>
+     * Used by tests.
+     *
+     * @param value the default value
+     */
+    public Location declaredLocation(Object value) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a new location compatible with the given initial value.
+     * <p>
+     * Used by tests.
+     */
+    public abstract Location locationForValue(Object value);
+
+    protected abstract Location locationForValueUpcast(Object value, Location oldLocation, int putFlags);
+
+    /**
+     * Creates a new location for a fixed type. It can only be assigned to values of this type.
+     * <p>
+     * Used by tests.
+     *
+     * @param type the Java type this location must be compatible with (may be primitive)
+     */
+    public abstract Location locationForType(Class<?> type);
+
+    protected <T extends Location> T advance(T location0) {
+        if (location0 instanceof LocationImpl location) {
+            location.accept(this);
+            assert layout.hasPrimitiveExtensionArray() || primitiveArraySize == 0;
+        }
+        depth++;
+        return location0;
+    }
+
+    /**
+     * Reserves space for the given location, so that it will not be available to subsequently
+     * allocated locations.
+     */
+    public BaseAllocator addLocation(Location location) {
+        advance(location);
+        return this;
+    }
+
+    @Override
+    public void visitObjectField(int index, int count) {
+        objectFieldSize = Math.max(objectFieldSize, index + count);
+    }
+
+    @Override
+    public void visitObjectArray(int index, int count) {
+        objectArraySize = Math.max(objectArraySize, index + count);
+    }
+
+    @Override
+    public void visitPrimitiveArray(int index, int count) {
+        primitiveArraySize = Math.max(primitiveArraySize, index + count);
+    }
+
+    @Override
+    public void visitPrimitiveField(int index, int count) {
+        primitiveFieldSize = Math.max(primitiveFieldSize, index + count);
+    }
+}

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

@@ -54,12 +54,11 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-@SuppressWarnings("deprecation")
 class Debug {
 
-    private static Collection<ShapeImpl> allShapes;
+    private static Collection<Shape> allShapes;
 
-    static void trackShape(ShapeImpl newShape) {
+    static void trackShape(Shape newShape) {
         allShapes.add(newShape);
     }
 
@@ -68,14 +67,14 @@ static void trackObject(DynamicObject obj) {
         ShapeProfiler.getInstance().track(obj);
     }
 
-    static Iterable<ShapeImpl> getAllShapes() {
+    static Iterable<Shape> getAllShapes() {
         return allShapes;
     }
 
     private static void dumpDOT() throws FileNotFoundException, UnsupportedEncodingException {
         try (PrintWriter out = new PrintWriter(getOutputFile("dot"), "UTF-8")) {
             GraphvizShapeVisitor visitor = new GraphvizShapeVisitor();
-            for (ShapeImpl shape : getAllShapes()) {
+            for (Shape shape : getAllShapes()) {
                 visitor.visitShape(shape);
             }
             out.println(visitor);
@@ -91,13 +90,13 @@ static String getId(Shape shape) {
     }
 
     interface DebugShapeVisitor<R> {
-        default R visitShape(ShapeImpl shape) {
-            Map<Transition, ShapeImpl> snapshot = new LinkedHashMap<>();
+        default R visitShape(Shape shape) {
+            Map<Transition, Shape> snapshot = new LinkedHashMap<>();
             shape.forEachTransition(snapshot::put);
             return visitShape(shape, Collections.unmodifiableMap(snapshot));
         }
 
-        R visitShape(ShapeImpl shape, Map<? extends Transition, ? extends ShapeImpl> transitions);
+        R visitShape(Shape shape, Map<? extends Transition, ? extends Shape> transitions);
     }
 
     static class GraphvizShapeVisitor implements DebugShapeVisitor<GraphvizShapeVisitor> {
@@ -109,7 +108,7 @@ static class GraphvizShapeVisitor implements DebugShapeVisitor<GraphvizShapeVisi
         }
 
         @Override
-        public GraphvizShapeVisitor visitShape(ShapeImpl shape, Map<? extends Transition, ? extends ShapeImpl> transitions) {
+        public GraphvizShapeVisitor visitShape(Shape shape, Map<? extends Transition, ? extends Shape> transitions) {
             if (!drawn.add(shape)) {
                 return this;
             }
@@ -139,8 +138,8 @@ public GraphvizShapeVisitor visitShape(ShapeImpl shape, Map<? extends Transition
             }
             sb.append("];");
 
-            for (Entry<? extends Transition, ? extends ShapeImpl> entry : transitions.entrySet()) {
-                ShapeImpl dst = entry.getValue();
+            for (Entry<? extends Transition, ? extends Shape> entry : transitions.entrySet()) {
+                Shape dst = entry.getValue();
                 this.visitShape(dst);
                 assert drawn.contains(dst);
 

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.api.object;
+
+final class DebugCounters {
+    private DebugCounters() {
+    }
+
+    static final DebugCounter shapeCount = DebugCounter.create("Shapes allocated total");
+    static final DebugCounter shapeCacheHitCount = DebugCounter.create("Shape cache hits");
+    static final DebugCounter shapeCacheMissCount = DebugCounter.create("Shape cache misses");
+    static final DebugCounter shapeCacheExpunged = DebugCounter.create("Shape cache expunged");
+    static final DebugCounter shapeCacheWeakKeys = DebugCounter.create("Shape cache weak keys");
+    static final DebugCounter propertyAssumptionsCreated = DebugCounter.create("Property assumptions created");
+    static final DebugCounter propertyAssumptionsRemoved = DebugCounter.create("Property assumptions removed");
+    static final DebugCounter propertyAssumptionsBlocked = DebugCounter.create("Property assumptions blocked");
+    static final DebugCounter transitionSingleEntriesCreated = DebugCounter.create("Transition single-entry maps created");
+    static final DebugCounter transitionMapsCreated = DebugCounter.create("Transition multi-entry maps created");
+}