Resolved review comments.

Author: tzezula

compiler/docs/NativeBridgeProcessor.md

@@ -393,8 +393,6 @@ def nativebridge_benchmark(args):
             target = os.path.join(target_dir, "bench")
             native_image_args = mx.get_runtime_jvm_args(benchmark_dist, jdk=jdk) + [
                 '--shared',
-                '--initialize-at-build-time=org.graalvm.processisolate.api,org.graalvm.processisolate.common,org.graalvm.processisolate.impl',
-                '',
                 '-o',
                 target
             ]

sdk/mx.sdk/mx_sdk.py

@@ -1249,7 +1249,7 @@ class UniversalDetector {
           "windows-aarch64",
       ],
       "layout": {
-        "external_isolate/": "dependency:org.graalvm.nativebridge.launcher",
+        "<os>/<arch>/": "dependency:org.graalvm.nativebridge.launcher",
       },
       "description": "Contains a launcher for process isolated polyglot.",
       "maven": False,

sdk/mx.sdk/suite.py

@@ -1 +1,2 @@
-ForceOnModulePath = org.graalvm.jniutils
+ForceOnModulePath = org.graalvm.jniutils
+Args = --initialize-at-build-time=org.graalvm.jniutils

sdk/src/org.graalvm.jniutils/src/META-INF/native-image/org.graalvm.sdk/jniutils/native-image.properties

@@ -1 +1,4 @@
-Args = --features=org.graalvm.nativebridge.benchmark.BenchmarkFeature
+Args = --features=org.graalvm.nativebridge.benchmark.BenchmarkFeature \
+       --initialize-at-build-time=org.graalvm.processisolate.api \
+       --initialize-at-build-time=org.graalvm.processisolate.common \
+       --initialize-at-build-time=org.graalvm.processisolate.impl

sdk/src/org.graalvm.nativebridge.benchmark/src/META-INF/native-image/native-image.properties

@@ -51,7 +51,7 @@ final class ProcessIsolate {
      */
     static int start(String[] args) {
         try {
-            ProcessIsolateConfig config = ProcessIsolateConfig.newWorkerBuilder(Path.of(args[0])).build();
+            ProcessIsolateConfig config = ProcessIsolateConfig.newTargetBuilder(Path.of(args[0])).build();
             BenchmarkFactoryGen.listen(config);
             return 0;
         } catch (Throwable t) {

sdk/src/org.graalvm.nativebridge.benchmark/src/org/graalvm/nativebridge/benchmark/ProcessIsolate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 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

sdk/src/org.graalvm.nativebridge.launcher/src/launcher.cc

@@ -43,6 +43,7 @@
 import org.graalvm.nativebridge.CustomDispatchAccessor;
 import org.graalvm.nativebridge.CustomDispatchFactory;
 import org.graalvm.nativebridge.CustomReceiverAccessor;
+import org.graalvm.nativebridge.ForeignObject;
 import org.graalvm.nativebridge.GenerateHotSpotToNativeBridge;
 import org.graalvm.nativebridge.GenerateNativeToHotSpotBridge;
 import org.graalvm.nativebridge.GenerateNativeToNativeBridge;
@@ -68,14 +69,14 @@ static Object getReceiver(ServiceAPI receiver) {
     }
 
     @CustomDispatchFactory
-    static ServiceAPI create1(Object receiver) {
+    static ServiceAPI create1(ForeignObject receiver) {
         return new ServiceAPI(null, receiver);
     }
 
     @CustomDispatchFactory
     @ExpectError("Only a single method can be annotated by the `CustomDispatchFactory`.%n" +
-                    "Fix the ambiguity by removing the `static ServiceAPI create1(Object receiver)` method or the `static ServiceAPI create2(Object receiver)` method.")
-    static ServiceAPI create2(Object receiver) {
+                    "Fix the ambiguity by removing the `static ServiceAPI create1(ForeignObject receiver)` method or the `static ServiceAPI create2(ForeignObject receiver)` method.")
+    static ServiceAPI create2(ForeignObject receiver) {
         return new ServiceAPI(null, receiver);
     }
 }

sdk/src/org.graalvm.nativebridge.processor.test/src/org/graalvm/nativebridge/processor/test/common/InvalidCustomDispatchFactory1Test.java

@@ -43,6 +43,7 @@
 import org.graalvm.nativebridge.CustomDispatchAccessor;
 import org.graalvm.nativebridge.CustomDispatchFactory;
 import org.graalvm.nativebridge.CustomReceiverAccessor;
+import org.graalvm.nativebridge.ForeignObject;
 import org.graalvm.nativebridge.GenerateHotSpotToNativeBridge;
 import org.graalvm.nativebridge.GenerateNativeToHotSpotBridge;
 import org.graalvm.nativebridge.GenerateNativeToNativeBridge;
@@ -68,10 +69,10 @@ static Object getReceiver(ServiceAPI receiver) {
     }
 
     @CustomDispatchFactory
-    @ExpectError("A method annotated by `CustomDispatchFactory` must be a non-private static method with a single object parameter and `ServiceAPI` return type.%n" +
-                    "To fix this change the signature to `static ServiceAPI create(Object receiver)`.")
+    @ExpectError("A method annotated by `CustomDispatchFactory` must be a non-private static method with a single `ForeignObject` parameter and `ServiceAPI` return type.%n" +
+                    "To fix this change the signature to `static ServiceAPI create(ForeignObject receiver)`.")
     @SuppressWarnings("static-method")
-    final ServiceAPI create(Object receiver) {
+    final ServiceAPI create(ForeignObject receiver) {
         return new ServiceAPI(null, receiver);
     }
 }

sdk/src/org.graalvm.nativebridge.processor.test/src/org/graalvm/nativebridge/processor/test/common/InvalidCustomDispatchFactory2Test.java

@@ -43,6 +43,7 @@
 import org.graalvm.nativebridge.CustomDispatchAccessor;
 import org.graalvm.nativebridge.CustomDispatchFactory;
 import org.graalvm.nativebridge.CustomReceiverAccessor;
+import org.graalvm.nativebridge.ForeignObject;
 import org.graalvm.nativebridge.GenerateHotSpotToNativeBridge;
 import org.graalvm.nativebridge.GenerateNativeToHotSpotBridge;
 import org.graalvm.nativebridge.GenerateNativeToNativeBridge;
@@ -68,9 +69,9 @@ static Object getReceiver(ServiceAPI receiver) {
     }
 
     @CustomDispatchFactory
-    @ExpectError("A method annotated by `CustomDispatchFactory` must be a non-private static method with a single object parameter and `ServiceAPI` return type.%n" +
-                    "To fix this change the signature to `static ServiceAPI create(Object receiver)`.")
-    private static ServiceAPI create(Object receiver) {
+    @ExpectError("A method annotated by `CustomDispatchFactory` must be a non-private static method with a single `ForeignObject` parameter and `ServiceAPI` return type.%n" +
+                    "To fix this change the signature to `static ServiceAPI create(ForeignObject receiver)`.")
+    private static ServiceAPI create(ForeignObject receiver) {
         return new ServiceAPI(null, receiver);
     }
 }