test/jdk/java/foreign/TestLinker.java

@@ -21,12 +21,10 @@
   * questions.
   */
  
  /*
   * @test
-  * @enablePreview
-  * @requires jdk.foreign.linker != "UNSUPPORTED"
   * @modules java.base/jdk.internal.foreign
   * @run testng TestLinker
   * @run testng/othervm/policy=security.policy
   *          -Djava.security.manager=default TestLinker
   */

@@ -35,20 +33,24 @@
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
  import java.lang.foreign.FunctionDescriptor;
  import java.lang.foreign.Linker;
+ import java.lang.foreign.MemoryLayout;
+ import java.lang.foreign.ValueLayout;
  import java.lang.invoke.MethodHandle;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
  
  import static java.lang.foreign.MemoryLayout.*;
  import static java.lang.foreign.ValueLayout.JAVA_CHAR;
  import static java.lang.foreign.ValueLayout.JAVA_SHORT;
+ import static org.testng.Assert.assertNotNull;
  import static org.testng.Assert.assertSame;
  import static org.testng.Assert.assertNotSame;
+ import static org.testng.Assert.assertTrue;
  
  public class TestLinker extends NativeTestHelper {
  
      static final boolean IS_FALLBACK_LINKER = CABI.current() == CABI.FALLBACK;
  

@@ -89,14 +91,10 @@
                      FunctionDescriptor.ofVoid(C_INT.withName("x")) },
              { FunctionDescriptor.ofVoid(structLayout(C_INT)),
                      FunctionDescriptor.ofVoid(structLayout(C_INT).withName("x")) },
              { FunctionDescriptor.ofVoid(structLayout(C_INT)),
                      FunctionDescriptor.ofVoid(structLayout(C_INT.withName("x"))) },
-             { FunctionDescriptor.ofVoid(structLayout(C_INT, paddingLayout(4), C_LONG_LONG)),
-                     FunctionDescriptor.ofVoid(structLayout(C_INT, paddingLayout(4), C_LONG_LONG.withName("x"))) },
-             { FunctionDescriptor.ofVoid(structLayout(C_INT, paddingLayout(4), C_LONG_LONG)),
-                     FunctionDescriptor.ofVoid(structLayout(C_INT, paddingLayout(4).withName("x"), C_LONG_LONG)) },
              { FunctionDescriptor.ofVoid(structLayout(sequenceLayout(1, C_INT))),
                      FunctionDescriptor.ofVoid(structLayout(sequenceLayout(1, C_INT).withName("x"))) },
              { FunctionDescriptor.ofVoid(structLayout(sequenceLayout(1, C_INT))),
                      FunctionDescriptor.ofVoid(structLayout(sequenceLayout(1, C_INT.withName("x")))) },
              { FunctionDescriptor.ofVoid(C_POINTER),

@@ -111,10 +109,16 @@
              cases.add(new Object[]{ FunctionDescriptor.ofVoid(unionLayout(C_INT)),
                      FunctionDescriptor.ofVoid(unionLayout(C_INT).withName("x")) });
              cases.add(new Object[]{ FunctionDescriptor.ofVoid(unionLayout(C_INT)),
                      FunctionDescriptor.ofVoid(unionLayout(C_INT.withName("x"))) });
          }
+         if (C_LONG_LONG.byteAlignment() == 8) {
+             cases.add(new Object[]{ FunctionDescriptor.ofVoid(structLayout(C_INT, paddingLayout(4), C_LONG_LONG)),
+                     FunctionDescriptor.ofVoid(structLayout(C_INT, paddingLayout(4), C_LONG_LONG.withName("x"))) });
+             cases.add(new Object[]{ FunctionDescriptor.ofVoid(structLayout(C_INT, paddingLayout(4), C_LONG_LONG)),
+                     FunctionDescriptor.ofVoid(structLayout(C_INT, paddingLayout(4).withName("x"), C_LONG_LONG)) });
+         }
  
          return cases.toArray(Object[][]::new);
      }
  
      @DataProvider

@@ -138,6 +142,29 @@
            expectedExceptionsMessageRegExp = ".*Unknown name.*")
      public void testInvalidPreservedValueName() {
          Linker.Option.captureCallState("foo"); // throws
      }
  
+     @Test(dataProvider = "canonicalTypeNames")
+     public void testCanonicalLayouts(String typeName) {
+         MemoryLayout layout = LINKER.canonicalLayouts().get(typeName);
+         assertNotNull(layout);
+         assertTrue(layout instanceof ValueLayout);
+     }
+ 
+     @DataProvider
+     public static Object[][] canonicalTypeNames() {
+         return new Object[][]{
+                 { "bool" },
+                 { "char" },
+                 { "short" },
+                 { "int" },
+                 { "long" },
+                 { "long long" },
+                 { "float" },
+                 { "double" },
+                 { "void*" },
+                 { "size_t" },
+                 { "wchar_t" },
+         };
+     }
  }