7903628: Replace ofAddress method in FI classes with a static invoke method

Reviewed-by: mcimadamore

Author: JornVernee

src/main/java/org/openjdk/jextract/impl/FunctionalInterfaceBuilder.java

@@ -58,14 +58,14 @@ public static void generate(SourceFileBuilder builder, String className, ClassSo
         fib.emitFunctionalInterfaceMethod();
         fib.emitDescriptorDecl();
         fib.emitFunctionalFactories();
-        fib.emitFunctionalFactoryForPointer();
+        fib.emitInvoke();
         fib.classEnd();
     }
 
     private void emitFunctionalInterfaceMethod() {
         appendIndentedLines(STR."""
 
-            \{methodType.returnType().getSimpleName()} apply(\{paramExprs("")});
+            \{methodType.returnType().getSimpleName()} apply(\{paramExprs()});
             """);
     }
 
@@ -80,22 +80,21 @@ static MemorySegment allocate(\{className()} fi, Arena scope) {
             """);
     }
 
-    private void emitFunctionalFactoryForPointer() {
+    private void emitInvoke() {
         boolean needsAllocator = Utils.isStructOrUnion(funcType.returnType());
-        String allocArg = needsAllocator ? ", (SegmentAllocator)arena" : "";
+        String allocParam = needsAllocator ? ", SegmentAllocator alloc" : "";
+        String allocArg = needsAllocator ? ", alloc" : "";
+        String paramStr = methodType.parameterCount() != 0 ? STR.",\{paramExprs()}" : "";
         appendIndentedLines(STR."""
 
             MethodHandle DOWN$MH = Linker.nativeLinker().downcallHandle($DESC);
 
-            static \{className()} ofAddress(MemorySegment addr, Arena arena) {
-                MemorySegment symbol = addr.reinterpret(arena, null);
-                return (\{paramExprs("_")}) -> {
-                    try {
-                        \{retExpr()} DOWN$MH.invokeExact(symbol\{allocArg}\{otherArgExprs()});
-                    } catch (Throwable ex$) {
-                        throw new AssertionError("should not reach here", ex$);
-                    }
-                };
+            static \{methodType.returnType().getSimpleName()} invoke(MemorySegment funcPtr\{allocParam}\{paramStr}) {
+                try {
+                    \{retExpr()} DOWN$MH.invokeExact(funcPtr\{allocArg}\{otherArgExprs()});
+                } catch (Throwable ex$) {
+                    throw new AssertionError("should not reach here", ex$);
+                }
             }
             """);
     }
@@ -109,13 +108,13 @@ private String parameterName(int i) {
         return name.isEmpty()? "_x" + i : name;
     }
 
-    private String paramExprs(String paramNamePrefix) {
+    private String paramExprs() {
         StringBuilder result = new StringBuilder();
         String delim = "";
         for (int i = 0 ; i < methodType.parameterCount(); i++) {
             result.append(delim).append(methodType.parameterType(i).getSimpleName());
             result.append(" ");
-            result.append(paramNamePrefix).append(parameterName(i));
+            result.append(parameterName(i));
             delim = ", ";
         }
         return result.toString();
@@ -133,7 +132,7 @@ private String otherArgExprs() {
         String argsExprs = "";
         if (methodType.parameterCount() > 0) {
             argsExprs += ", " + IntStream.range(0, methodType.parameterCount())
-                    .mapToObj(i -> "_" + parameterName(i))
+                    .mapToObj(this::parameterName)
                     .collect(Collectors.joining(", "));
         }
         return argsExprs;

test/jtreg/generator/allocCallback/TestAllocCallback.java

@@ -52,8 +52,8 @@ public void testOfAddress() {
         try (Arena arena = Arena.ofConfined()) {
             var foo = alloc_callback_h.foo$SEGMENT();
 
-            var barA = Foo.a.ofAddress(Foo.a(foo), arena).apply();
-            var barB = Foo.b.ofAddress(Foo.b(foo), arena).apply(100);
+            var barA = Foo.a.invoke(Foo.a(foo), arena);
+            var barB = Foo.b.invoke(Foo.b(foo), arena, 100);
 
             assertEquals(Bar.a(barA), 5);
             assertEquals(Bar.a(barB), 100);

test/jtreg/generator/funcPointerInvokers/TestFuncPointerInvokers.java

@@ -54,7 +54,7 @@ public void testStructFieldFITypedef() {
             AtomicInteger val = new AtomicInteger(-1);
             MemorySegment bar = Bar.allocate(arena);
             Bar.foo(bar, Foo.allocate((i) -> val.set(i), arena));
-            Foo.ofAddress(Bar.foo(bar), arena).apply(42);
+            Foo.invoke(Bar.foo(bar), 42);
             assertEquals(val.get(), 42);
         }
     }
@@ -64,7 +64,7 @@ public void testGlobalFITypedef() {
         try (Arena arena = Arena.ofConfined()) {
             AtomicInteger val = new AtomicInteger(-1);
             f(Foo.allocate((i) -> val.set(i), arena));
-            Foo.ofAddress(f(), arena).apply(42);
+            Foo.invoke(f(), 42);
             assertEquals(val.get(), 42);
         }
     }
@@ -75,7 +75,7 @@ public void testStructFieldFIFunctionPointer() {
             AtomicInteger val = new AtomicInteger(-1);
             MemorySegment baz = Baz.allocate(arena);
             Baz.fp(baz, Baz.fp.allocate((i) -> val.set(i), arena));
-            Baz.fp.ofAddress(Baz.fp(baz), arena).apply(42);
+            Baz.fp.invoke(Baz.fp(baz), 42);
             assertEquals(val.get(), 42);
         }
     }
@@ -85,7 +85,7 @@ public void testGlobalFIFunctionPointer() {
         try (Arena arena = Arena.ofConfined()) {
             AtomicInteger val = new AtomicInteger(-1);
             fp(fp.allocate((i) -> val.set(i), arena));
-            fp.ofAddress(fp(), arena).apply(42);
+            fp.invoke(fp(), 42);
             assertEquals(val.get(), 42);
         }
     }
@@ -94,7 +94,7 @@ public void testGlobalFIFunctionPointer() {
     public void testGlobalFIFunctionPointerAddress() {
         try (Arena arena = Arena.ofConfined()) {
             fp_addr(fp_addr.allocate((addr) -> MemorySegment.ofAddress(addr.address() + 1), arena));
-            assertEquals(fp_addr.ofAddress(fp_addr(), arena).apply(MemorySegment.ofAddress(42)), MemorySegment.ofAddress(43));
+            assertEquals(fp_addr.invoke(fp_addr(), MemorySegment.ofAddress(42)), MemorySegment.ofAddress(43));
         }
     }
 }

test/jtreg/generator/test8261511/Test8261511.java

@@ -51,8 +51,7 @@ public class Test8261511 {
     public void test() {
         try (Arena arena = Arena.ofConfined()) {
             var funcPtr = Foo.sum(get_foo(arena));
-            var sumIface = Foo.sum.ofAddress(funcPtr, arena);
-            assertEquals(sumIface.apply(15,20), 35);
+            assertEquals(Foo.sum.invoke(funcPtr, 15, 20), 35);
             assertEquals(sum(1.2, 4.5), 5.7, 0.001);
         }
     }