Migrate usages to new Shape.Builder.layout(Class,Lookup).

Author: woess

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -24,18 +24,8 @@
  */
 package jdk.graal.compiler.truffle.test;
 
-import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode;
-import jdk.graal.compiler.truffle.test.nodes.RootTestNode;
-import jdk.graal.compiler.graph.Node;
-import jdk.graal.compiler.nodes.NamedLocationIdentity;
-import jdk.graal.compiler.nodes.StructuredGraph;
-import jdk.graal.compiler.nodes.extended.GuardedUnsafeLoadNode;
-import jdk.graal.compiler.nodes.extended.RawLoadNode;
-import jdk.graal.compiler.nodes.extended.RawStoreNode;
-import jdk.graal.compiler.nodes.extended.UnsafeAccessNode;
-import jdk.graal.compiler.nodes.java.LoadFieldNode;
-import jdk.graal.compiler.nodes.java.StoreFieldNode;
-import jdk.graal.compiler.truffle.nodes.ObjectLocationIdentity;
+import java.lang.invoke.MethodHandles;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -50,6 +40,18 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.runtime.OptimizedCallTarget;
 
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.GuardedUnsafeLoadNode;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.extended.UnsafeAccessNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.truffle.nodes.ObjectLocationIdentity;
+import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode;
+import jdk.graal.compiler.truffle.test.nodes.RootTestNode;
 import jdk.vm.ci.meta.JavaKind;
 
 public class DynamicObjectPartialEvaluationTest extends PartialEvaluationTest {
@@ -59,8 +61,9 @@ public class DynamicObjectPartialEvaluationTest extends PartialEvaluationTest {
 
     @Before
     public void before() {
-        rootShapeWithoutFields = Shape.newBuilder().layout(TestDynamicObject.class).build();
-        rootShapeWithFields = Shape.newBuilder().layout(TestDynamicObjectWithFields.class).build();
+        var lookup = MethodHandles.lookup();
+        rootShapeWithoutFields = Shape.newBuilder().layout(TestDynamicObject.class, lookup).build();
+        rootShapeWithFields = Shape.newBuilder().layout(TestDynamicObjectWithFields.class, lookup).build();
         newInstanceWithFields();
         newInstanceWithoutFields();
     }

truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/DynamicObjectConstructorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -43,6 +43,8 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.lang.invoke.MethodHandles;
+
 import org.junit.Test;
 
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
@@ -53,15 +55,15 @@ public class DynamicObjectConstructorTest extends AbstractLibraryTest {
 
     @Test
     public void testIncompatibleShape() {
-        Shape shape = Shape.newBuilder().layout(TestDynamicObjectDefault.class).build();
+        Shape shape = Shape.newBuilder().layout(TestDynamicObjectDefault.class, MethodHandles.lookup()).build();
 
         assertFails(() -> new TestDynamicObjectMinimal(shape), IllegalArgumentException.class,
                         ex -> assertThat(ex.getMessage(), containsString("Incompatible shape")));
     }
 
     @Test
     public void testNonEmptyShape() {
-        Shape emptyShape = Shape.newBuilder().layout(TestDynamicObjectDefault.class).build();
+        Shape emptyShape = Shape.newBuilder().layout(TestDynamicObjectDefault.class, MethodHandles.lookup()).build();
         TestDynamicObjectDefault obj = new TestDynamicObjectDefault(emptyShape);
         DynamicObjectLibrary.getUncached().put(obj, "key", "value");
         Shape nonEmptyShape = obj.getShape();

truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/DynamicObjectLibraryTest.java

@@ -48,6 +48,7 @@
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -85,10 +86,14 @@ public static Collection<Object[]> parameters() {
         Supplier<? extends DynamicObject> minimalSupplier = () -> new TestDynamicObjectMinimal(shapeMin);
         addParams(params, minimalSupplier);
 
-        Shape shapeDef = Shape.newBuilder().layout(TestDynamicObjectDefault.class).build();
+        Shape shapeDef = Shape.newBuilder().layout(TestDynamicObjectDefault.class, MethodHandles.lookup()).build();
         Supplier<? extends DynamicObject> defaultSupplier = () -> new TestDynamicObjectDefault(shapeDef);
         addParams(params, defaultSupplier);
 
+        Shape shapeDefLegacy = Shape.newBuilder().layout(TestDynamicObjectDefault.class).build();
+        Supplier<? extends DynamicObject> defaultSupplierLegacy = () -> new TestDynamicObjectDefault(shapeDefLegacy);
+        addParams(params, defaultSupplierLegacy);
+
         return params;
     }
 

truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LeakCheckTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -43,6 +43,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
+import java.lang.invoke.MethodHandles;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -59,7 +60,7 @@ public class LeakCheckTest {
     private static final DynamicObjectLibrary LIBRARY = DynamicObjectLibrary.getUncached();
 
     private static Shape newEmptyShape() {
-        return Shape.newBuilder().layout(TestDynamicObjectDefault.class).build();
+        return Shape.newBuilder().layout(TestDynamicObjectDefault.class, MethodHandles.lookup()).build();
     }
 
     private static DynamicObject newInstance(Shape emptyShape) {

truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LocationTest.java

@@ -42,13 +42,16 @@
 
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.getLocationType;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
 import com.oracle.truffle.api.object.DynamicObject;
@@ -63,12 +66,27 @@
 @RunWith(Parameterized.class)
 public class LocationTest extends AbstractParametrizedLibraryTest {
 
-    @Parameters(name = "{0}")
-    public static List<TestRun> data() {
-        return Arrays.asList(TestRun.values());
+    @Parameter(1) public boolean useLookup;
+
+    @Parameters(name = "{0},{1}")
+    public static List<Object[]> data() {
+        return Arrays.stream(TestRun.values()).flatMap(run -> List.of(Boolean.FALSE, Boolean.TRUE).stream().map(lookup -> new Object[]{run, lookup})).toList();
     }
 
-    final Shape rootShape = Shape.newBuilder().layout(TestDynamicObjectDefault.class).build();
+    Shape rootShape;
+
+    @Before
+    public void setup() {
+        rootShape = makeRootShape();
+    }
+
+    private Shape makeRootShape() {
+        if (useLookup) {
+            return Shape.newBuilder().layout(TestDynamicObjectDefault.class, MethodHandles.lookup()).build();
+        } else {
+            return Shape.newBuilder().layout(TestDynamicObjectDefault.class).build();
+        }
+    }
 
     private DynamicObject newInstance() {
         return new TestDynamicObjectDefault(rootShape);

truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/RemoveKeyTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -40,6 +40,7 @@
  */
 package com.oracle.truffle.object.basic.test;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +63,7 @@ public static List<TestRun> data() {
         return Arrays.asList(TestRun.values());
     }
 
-    final Shape rootShape = Shape.newBuilder().allowImplicitCastIntToDouble(true).layout(TestDynamicObjectDefault.class).build();
+    final Shape rootShape = Shape.newBuilder().allowImplicitCastIntToDouble(true).layout(TestDynamicObjectDefault.class, MethodHandles.lookup()).build();
 
     @Test
     public void testRemoveAfterReplace() {

truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/ShapeTest.java

@@ -40,18 +40,42 @@
  */
 package com.oracle.truffle.object.basic.test;
 
+import java.lang.invoke.MethodHandles;
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
 import com.oracle.truffle.api.object.Property;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.object.ShapeImpl;
 
 @SuppressWarnings("deprecation")
+@RunWith(Parameterized.class)
 public class ShapeTest {
 
+    @Parameters(name = "{0}")
+    public static List<Boolean> data() {
+        return Arrays.asList(Boolean.FALSE, Boolean.TRUE);
+    }
+
+    @Parameter public boolean useLookup;
+
+    private Shape makeRootShape() {
+        if (useLookup) {
+            return Shape.newBuilder().layout(TestDynamicObjectDefault.class, MethodHandles.lookup()).allowImplicitCastIntToLong(true).build();
+        } else {
+            return Shape.newBuilder().layout(TestDynamicObjectDefault.class).allowImplicitCastIntToLong(true).build();
+        }
+    }
+
     @Test
     public void testToString() {
-        ShapeImpl rootShape = (ShapeImpl) Shape.newBuilder().layout(TestDynamicObjectDefault.class).allowImplicitCastIntToLong(true).build();
+        ShapeImpl rootShape = (ShapeImpl) makeRootShape();
         DOTestAsserts.assertShape(new String[]{}, rootShape);
 
         ShapeImpl aInt = rootShape.defineProperty("a", 1, 0);

truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/SharedShapeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -42,6 +42,7 @@
 
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.getLocationType;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.List;
 
@@ -66,7 +67,7 @@ public static List<TestRun> data() {
         return Arrays.asList(TestRun.values());
     }
 
-    final Shape rootShape = Shape.newBuilder().layout(TestDynamicObjectDefault.class).allowImplicitCastIntToLong(true).build();
+    final Shape rootShape = Shape.newBuilder().layout(TestDynamicObjectDefault.class, MethodHandles.lookup()).allowImplicitCastIntToLong(true).build();
     final Shape sharedShape = rootShape.makeSharedShape();
 
     private DynamicObject newInstance() {

truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java

@@ -41,6 +41,7 @@
 package com.oracle.truffle.sl;
 
 import java.io.PrintStream;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -266,7 +267,7 @@ public final class SLLanguage extends TruffleLanguage<SLContext> {
 
     public SLLanguage() {
         counter++;
-        this.rootShape = Shape.newBuilder().layout(SLObject.class).build();
+        this.rootShape = Shape.newBuilder().layout(SLObject.class, MethodHandles.lookup()).build();
     }
 
     @Override