test/jdk/java/foreign/TestSegments.java

@@ -21,12 +21,11 @@
   * questions.
   */
  
  /*
   * @test
-  * @enablePreview
-  * @requires jdk.foreign.linker != "UNSUPPORTED"
+  * @requires vm.bits == 64
   * @run testng/othervm -Xmx4G -XX:MaxDirectMemorySize=1M --enable-native-access=ALL-UNNAMED TestSegments
   */
  
  import java.lang.foreign.*;
  

@@ -82,22 +81,22 @@
          MemorySegment segment = scope.allocate(1024L * 1024 * 8 * 2, 1); // 2M
      }
  
      @Test
      public void testNativeSegmentIsZeroed() {
-         VarHandle byteHandle = ValueLayout.JAVA_BYTE.arrayElementVarHandle();
+         VarHandle byteHandle = ValueLayout.JAVA_BYTE.varHandle();
          try (Arena arena = Arena.ofConfined()) {
              MemorySegment segment = arena.allocate(1000, 1);
              for (long i = 0 ; i < segment.byteSize() ; i++) {
                  assertEquals(0, (byte)byteHandle.get(segment, i));
              }
          }
      }
  
      @Test
      public void testSlices() {
-         VarHandle byteHandle = ValueLayout.JAVA_BYTE.arrayElementVarHandle();
+         VarHandle byteHandle = ValueLayout.JAVA_BYTE.varHandle();
          try (Arena arena = Arena.ofConfined()) {
              MemorySegment segment = arena.allocate(10, 1);
              //init
              for (byte i = 0 ; i < segment.byteSize() ; i++) {
                  byteHandle.set(segment, (long)i, i);

@@ -261,11 +260,11 @@
          return l.stream().map(s -> new Object[] { s }).toArray(Object[][]::new);
      }
  
      @Test(dataProvider = "segmentFactories")
      public void testFill(Supplier<MemorySegment> segmentSupplier) {
-         VarHandle byteHandle = ValueLayout.JAVA_BYTE.arrayElementVarHandle();
+         VarHandle byteHandle = ValueLayout.JAVA_BYTE.varHandle();
  
          for (byte value : new byte[] {(byte) 0xFF, (byte) 0x00, (byte) 0x45}) {
              MemorySegment segment = segmentSupplier.get();
              segment.fill(value);
              for (long l = 0; l < segment.byteSize(); l++) {