Remove deprecated Layout API and LayoutFactory service provider.

Simplify LayoutFactory.createShape.
Remove obsolete internal "since" tags.
Remove unnecessary SuppressWarnings("deprecation").

Author: woess

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleRuntimeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,16 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import jdk.graal.compiler.api.test.Graal;
-import jdk.graal.compiler.runtime.RuntimeProvider;
 import org.junit.Test;
 
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.impl.DefaultTruffleRuntime;
 import com.oracle.truffle.api.impl.TVMCI;
 
+import jdk.graal.compiler.api.test.Graal;
+import jdk.graal.compiler.runtime.RuntimeProvider;
+
 public class TruffleRuntimeTest {
 
     @Test
@@ -75,12 +76,4 @@ public void testGetCapabilityObjectClass() {
         assertNull("Expected null return value for Object.class", object);
     }
 
-    @SuppressWarnings("deprecation")
-    @Test
-    public void testGetLayoutFactory() {
-        TruffleRuntime runtime = Truffle.getRuntime();
-        com.oracle.truffle.api.object.LayoutFactory layoutFactory = runtime.getCapability(com.oracle.truffle.api.object.LayoutFactory.class);
-        assertNotNull("LayoutFactory not found", layoutFactory);
-        // Rely on modules to only load trusted service providers
-    }
 }

truffle/mx.truffle/suite.py

@@ -1633,7 +1633,6 @@
         ],
         "uses" : [
           "com.oracle.truffle.api.impl.TruffleLocator",
-          "com.oracle.truffle.api.object.LayoutFactory",
           "com.oracle.truffle.runtime.LoopNodeFactory",
           "com.oracle.truffle.runtime.TruffleTypes",
           "com.oracle.truffle.runtime.EngineCacheSupport",

truffle/src/com.oracle.truffle.api.object/snapshot.sigtest

@@ -178,36 +178,6 @@ meth public abstract int getInt(com.oracle.truffle.api.object.DynamicObject,com.
 meth public abstract void setInt(com.oracle.truffle.api.object.DynamicObject,int,com.oracle.truffle.api.object.Shape) throws com.oracle.truffle.api.object.FinalLocationException
  anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.2")
 
-CLSS public abstract com.oracle.truffle.api.object.Layout
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="21.1")
-cons protected init()
-fld public final static java.lang.String OPTION_PREFIX = "truffle.object."
-innr protected abstract static Access
-meth protected com.oracle.truffle.api.object.Shape buildShape(java.lang.Object,java.lang.Object,int,com.oracle.truffle.api.Assumption)
-meth protected static com.oracle.truffle.api.object.LayoutFactory getFactory()
-meth public abstract java.lang.Class<? extends com.oracle.truffle.api.object.DynamicObject> getType()
-supr java.lang.Object
-hfds INT_TO_DOUBLE_FLAG,INT_TO_LONG_FLAG,LAYOUT_FACTORY
-
-CLSS protected abstract static com.oracle.truffle.api.object.Layout$Access
- outer com.oracle.truffle.api.object.Layout
-cons protected init()
-meth public final com.oracle.truffle.api.object.Shape getShape(com.oracle.truffle.api.object.DynamicObject)
-meth public final int[] getPrimitiveArray(com.oracle.truffle.api.object.DynamicObject)
-meth public final java.lang.Class<? extends java.lang.annotation.Annotation> getDynamicFieldAnnotation()
-meth public final java.lang.Object[] getObjectArray(com.oracle.truffle.api.object.DynamicObject)
-meth public final void setObjectArray(com.oracle.truffle.api.object.DynamicObject,java.lang.Object[])
-meth public final void setPrimitiveArray(com.oracle.truffle.api.object.DynamicObject,int[])
-meth public final void setShape(com.oracle.truffle.api.object.DynamicObject,com.oracle.truffle.api.object.Shape)
-supr java.lang.Object
-
-CLSS public abstract interface com.oracle.truffle.api.object.LayoutFactory
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.2")
-meth public abstract com.oracle.truffle.api.object.Property createProperty(java.lang.Object,com.oracle.truffle.api.object.Location,int)
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.2")
-meth public abstract int getPriority()
-meth public com.oracle.truffle.api.object.Shape createShape(java.lang.Object)
-
 CLSS public abstract com.oracle.truffle.api.object.Location
 cons protected init()
 meth protected double getDouble(com.oracle.truffle.api.object.DynamicObject,boolean) throws com.oracle.truffle.api.nodes.UnexpectedResultException
@@ -297,8 +267,6 @@ CLSS public abstract com.oracle.truffle.api.object.Shape
 cons protected init()
 innr public final static Builder
 innr public final static DerivedBuilder
-meth protected abstract com.oracle.truffle.api.object.Layout getLayout()
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="24.2")
 meth protected abstract com.oracle.truffle.api.object.Shape addProperty(com.oracle.truffle.api.object.Property)
 meth protected abstract com.oracle.truffle.api.object.Shape defineProperty(java.lang.Object,java.lang.Object,int,int)
 meth protected abstract com.oracle.truffle.api.object.Shape removeProperty(com.oracle.truffle.api.object.Property)

truffle/src/com.oracle.truffle.api.object/src/META-INF/services/com.oracle.truffle.api.object.LayoutFactory

@@ -61,7 +61,6 @@
 
 import sun.misc.Unsafe;
 
-@SuppressWarnings("deprecation")
 class CoreAllocator extends ShapeImpl.BaseAllocator {
 
     CoreAllocator(LayoutImpl layout) {

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

@@ -40,16 +40,14 @@
  */
 package com.oracle.truffle.api.object;
 
-import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 
+import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Pair;
-import org.graalvm.collections.UnmodifiableEconomicMap;
 
 import com.oracle.truffle.api.Assumption;
 
-@SuppressWarnings("deprecation")
-public class CoreLayoutFactory implements com.oracle.truffle.api.object.LayoutFactory {
+class CoreLayoutFactory implements LayoutFactory {
 
     @Override
     public final Property createProperty(Object id, Location location, int flags) {
@@ -70,25 +68,22 @@ public LayoutImpl createLayout(Class<? extends DynamicObject> layoutClass, Looku
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public final Shape createShape(Object builderArgs) {
-        Object[] args = (Object[]) builderArgs;
-        Class<? extends DynamicObject> layoutClass = (Class<? extends DynamicObject>) args[0];
-        int implicitCastFlags = (int) args[1];
-        Object dynamicType = args[2];
-        Object sharedData = args[3];
-        int shapeFlags = (int) args[4];
-        var constantProperties = (UnmodifiableEconomicMap<Object, Pair<Object, Integer>>) args[5];
-        var singleContextAssumption = (Assumption) args[6];
-        var layoutLookup = (MethodHandles.Lookup) args[7];
+    public final Shape createShape(Class<? extends DynamicObject> layoutClass,
+                    int implicitCastFlags,
+                    Object dynamicType,
+                    Object sharedData,
+                    int shapeFlags,
+                    EconomicMap<Object, Pair<Object, Integer>> constantProperties,
+                    Assumption singleContextAssumption,
+                    Lookup layoutLookup) {
 
         LayoutImpl impl = createLayout(layoutClass, layoutLookup, implicitCastFlags);
         ShapeImpl shape = impl.newShape(dynamicType, sharedData, shapeFlags, singleContextAssumption);
 
         if (constantProperties != null) {
             var cursor = constantProperties.getEntries();
             while (cursor.advance()) {
-                shape = shape.addProperty(Property.create(cursor.getKey(), impl.createAllocator().constantLocation(cursor.getValue().getLeft()), cursor.getValue().getRight()));
+                shape = shape.addProperty(createProperty(cursor.getKey(), impl.createAllocator().constantLocation(cursor.getValue().getLeft()), cursor.getValue().getRight()));
             }
         }
 

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

@@ -80,7 +80,6 @@ protected boolean isObjectLocation() {
      * For sets to final locations, otherValue.equals(thisValue) seems more beneficial, since we
      * usually know more about the value to be set.
      */
-    @SuppressWarnings("deprecation")
     static boolean valueEquals(Object val1, Object val2) {
         return val1 == val2 || (val1 != null && equalsBoundary(val1, val2));
     }

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

@@ -58,7 +58,6 @@
 import com.oracle.truffle.api.object.CoreLocations.LongLocation;
 import com.oracle.truffle.api.object.CoreLocations.ObjectLocation;
 
-@SuppressWarnings("deprecation")
 class DefaultLayout extends LayoutImpl {
     private final ObjectLocation[] objectFields;
     private final LongLocation[] primitiveFields;

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

@@ -76,7 +76,6 @@
 
 import sun.misc.Unsafe;
 
-@SuppressWarnings("deprecation")
 abstract class ExtAllocator extends BaseAllocator {
 
     /** Placeholder for when no value is available or no type speculation should be performed. */

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

@@ -42,8 +42,7 @@
 
 import java.lang.invoke.MethodHandles.Lookup;
 
-@SuppressWarnings("deprecation")
-public class ExtDefaultLayoutFactory extends ExtLayoutFactory {
+class ExtDefaultLayoutFactory extends ExtLayoutFactory {
 
     @Override
     public int getPriority() {