[GR-57636] Replace LibGraalFeature with GuestGraalFeature.

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LibGraalCompilationDriver.java

@@ -156,8 +156,7 @@ public HotSpotGraalRuntimeProvider getGraalRuntime() {
     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
     /**
-     * Implemented by
-     * {@code com.oracle.svm.graal.hotspot.libgraal.LibGraalEntryPoints.compileMethod}.
+     * Implemented by {@code com.oracle.svm.graal.hotspot.guestgraal.GuestGraal#compileMethod}.
      */
     public static native long compileMethodInLibgraal(long isolateThread,
                     long methodHandle,

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LibGraalCompilerTest.java

@@ -60,7 +60,7 @@ public class LibGraalCompilerTest extends HotSpotGraalCompilerTest {
      * Computes a hash based on the static final Object fields in {@code typeHandle}.
      *
      * Implemented by
-     * {@code com.oracle.svm.graal.hotspot.libgraal.LibGraalEntryPoints.hashConstantOopFields}.
+     * {@code com.oracle.svm.graal.hotspot.guestgraal.GuestGraal#hashConstantOopFields}.
      *
      * @param isolateThread
      * @param typeHandle the type whose constant object fields are to be hashed

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalCompiler.java

@@ -251,18 +251,6 @@ private static String match(StructuredGraph graph, String methodPattern) {
         return label;
     }
 
-    /**
-     * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal.
-     * Target_jdk_graal_compiler_core_GraalCompiler} to optionally test routing fatal error handling
-     * from libgraal to HotSpot.
-     *
-     * @return true if the caller should proceed to throw an exception
-     */
-    @SuppressWarnings("unused")
-    private static boolean notifyCrash(String crashMessage) {
-        return true;
-    }
-
     /**
      * Builds the graph, optimizes it.
      */

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalServiceThread.java

@@ -71,15 +71,15 @@ protected void onAttachError(InternalError error) {
     }
 
     /**
-     * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal.
-     * Target_jdk_graal_compiler_core_GraalServiceThread} to attach to the peer runtime if required.
+     * Substituted by {@code Target_jdk_graal_compiler_core_GraalServiceThread} to attach to the
+     * peer runtime if required.
      */
     private void afterRun() {
     }
 
     /**
-     * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal.
-     * Target_jdk_graal_compiler_core_GraalServiceThread} to attach to the peer runtime if required.
+     * Substituted by {@code Target_jdk_graal_compiler_core_GraalServiceThread} to attach to the
+     * peer runtime if required.
      */
     private void beforeRun() {
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilerConfigurationFactory.java

@@ -285,6 +285,13 @@ private Object getLoadedFromLocation(boolean verbose) {
 
     private static String nativeImageLocationQualifier;
 
+    /**
+     * Gets the qualifier for the libgraal library (e.g., "PGO optimized").
+     */
+    public static String getNativeImageLocationQualifier() {
+        return nativeImageLocationQualifier;
+    }
+
     /**
      * Records a qualifier for the libgraal library (e.g., "PGO optimized").
      */

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalOptionValues.java

@@ -168,8 +168,7 @@ private static String stripPrefix(String name, String prefix) {
     }
 
     /**
-     * Substituted by
-     * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_graal_compiler_hotspot_HotSpotGraalOptionValues}.
+     * Substituted by {@code Target_jdk_graal_compiler_hotspot_HotSpotGraalOptionValues}.
      *
      * @param settings unparsed libgraal option values
      */
@@ -195,8 +194,7 @@ static void printProperties(OptionValues compilerOptions, PrintStream out) {
     }
 
     /**
-     * Substituted by
-     * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_graal_compiler_hotspot_HotSpotGraalOptionValues}.
+     * Substituted by {@code Target_jdk_graal_compiler_hotspot_HotSpotGraalOptionValues}.
      *
      * @param out where help is to be printed
      * @param prefix system property prefix for libgraal VM options

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/guestgraal/BuildTime.java

@@ -40,6 +40,7 @@
 import java.util.function.Supplier;
 
 import jdk.graal.compiler.core.ArchitectureSpecific;
+import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
 import org.graalvm.collections.EconomicMap;
 
 import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
@@ -146,6 +147,7 @@ public static void configureGraalForLibGraal(String arch,
                     List<Class<?>> guestServiceClasses,
                     Consumer<Class<?>> registerAsInHeap,
                     Consumer<List<Class<?>>> hostedGraalSetFoldNodePluginClasses,
+                    String nativeImageLocationQualifier,
                     String encodedGuestObjects) {
         GraalError.guarantee(VALID_LOADER_NAME.equals(LOADER.getName()),
                         "Only call this method from classloader " + VALID_LOADER_NAME);
@@ -154,6 +156,8 @@ public static void configureGraalForLibGraal(String arch,
         guestServiceClasses.forEach(c -> addProviders(services, arch, c));
         GraalServices.setLibgraalServices(services);
 
+        CompilerConfigurationFactory.setNativeImageLocationQualifier(nativeImageLocationQualifier);
+
         try {
             Field cachedHotSpotJVMCIBackendFactoriesField = ObjectCopier.getField(HotSpotJVMCIRuntime.class, "cachedHotSpotJVMCIBackendFactories");
             GraalError.guarantee(cachedHotSpotJVMCIBackendFactoriesField.get(null) == null, "Expect cachedHotSpotJVMCIBackendFactories to be null");

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/guestgraal/RunTime.java

@@ -116,6 +116,9 @@ public static long compileMethod(long methodHandle, boolean useProfilingInfo,
 
         HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime();
         HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) runtime.getCompiler();
+        if (methodHandle == 0L) {
+            return 0L;
+        }
 
         int entryBCI = JVMCICompiler.INVOCATION_ENTRY_BCI;
         HotSpotResolvedJavaMethod method = runtime.unhand(HotSpotResolvedJavaMethod.class, methodHandle);

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -2508,7 +2508,6 @@ def get_build_args(self):
             '-H:APIFunctionPrefix=truffle_isolate_',
         ] + svm_experimental_options([
             '-H:+IgnoreMaxHeapSizeWhileInVMOperation',
-            '-H:+BuildOutputPrefix',
             '-H:+GenerateBuildArtifactsFile',  # generate 'build-artifacts.json'
         ]) + mx.get_runtime_jvm_args(self.subject.native_image_jar_distributions) + \
         project.native_image_config.build_args + project.native_image_config.build_args_enterprise

substratevm/mx.substratevm/mx_substratevm.py

@@ -1428,7 +1428,7 @@ def _native_image_launcher_extra_jvm_args():
 libgraal_jar_distributions = [
     'sdk:NATIVEBRIDGE',
     'sdk:JNIUTILS',
-    'substratevm:GRAAL_HOTSPOT_LIBRARY']
+    'substratevm:GUESTGRAAL_LIBRARY']
 
 def allow_build_path_in_libgraal():
     """
@@ -1458,13 +1458,18 @@ def prevent_build_path_in_libgraal():
             return ['-H:NativeLinkerOption=-pdbaltpath:%_PDB%']
     return []
 
+libgraal_features = [
+    'com.oracle.svm.graal.hotspot.guestgraal.GuestGraalFeature'
+]
+
 libgraal_build_args = [
+    '--features=' + ','.join(libgraal_features),
+
     ## Pass via JVM args opening up of packages needed for image builder early on
     '-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.hotspot=ALL-UNNAMED',
     '-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED',
     '-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.truffle=ALL-UNNAMED',
     '-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.truffle.hotspot=ALL-UNNAMED',
-    '-J--add-exports=org.graalvm.jniutils/org.graalvm.jniutils=ALL-UNNAMED',
     '-J--add-exports=org.graalvm.truffle.compiler/com.oracle.truffle.compiler.hotspot.libgraal=ALL-UNNAMED',
     '-J--add-exports=org.graalvm.truffle.compiler/com.oracle.truffle.compiler.hotspot=ALL-UNNAMED',
     '-J--add-exports=org.graalvm.truffle.compiler/com.oracle.truffle.compiler=ALL-UNNAMED',
@@ -1537,7 +1542,7 @@ def prevent_build_path_in_libgraal():
             destination="<lib:jvmcicompiler>",
             jvm_library=True,
             jar_distributions=libgraal_jar_distributions,
-            build_args=libgraal_build_args + ['--features=com.oracle.svm.graal.hotspot.libgraal.LibGraalFeature,com.oracle.svm.graal.hotspot.libgraal.truffle.TruffleLibGraalFeature'],
+            build_args=libgraal_build_args,
             add_to_module='java.base',
             headers=False,
             home_finder=False,

substratevm/mx.substratevm/suite.py

@@ -1351,39 +1351,6 @@
             "jacoco" : "exclude",
         },
 
-        "com.oracle.svm.graal.hotspot.libgraal" : {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": [
-                "com.oracle.svm.graal.hotspot",
-                "com.oracle.svm.graal",
-                "compiler:GRAAL",
-                "sdk:NATIVEBRIDGE",
-            ],
-            "requires" : [
-            	"jdk.management"
-            ],
-            "requiresConcealed" : {
-                "java.base" : [
-                    "jdk.internal.misc",
-                ],
-                "jdk.internal.vm.ci": [
-                    "jdk.vm.ci.meta",
-                    "jdk.vm.ci.code",
-                    "jdk.vm.ci.hotspot",
-                ]
-            },
-            "checkstyle" : "com.oracle.svm.hosted",
-            "javaCompliance" : "21+",
-            "annotationProcessors": [
-                "truffle:TRUFFLE_LIBGRAAL_PROCESSOR",
-                "compiler:GRAAL_PROCESSOR",
-                "SVM_PROCESSOR",
-            ],
-            "defaultBuild": False,
-            "jacoco" : "exclude",
-        },
-
         "com.oracle.svm.configure": {
             "subDir": "src",
             "sourceDirs": [
@@ -1853,26 +1820,6 @@
           "maven" : False,
         },
 
-        "GRAAL_HOTSPOT_LIBRARY": {
-            "subDir": "src",
-            "description" : "SubstrateVM HotSpot Graal library support",
-            "javaCompliance" : "21+",
-            "dependencies": [
-                "com.oracle.svm.graal.hotspot.libgraal",
-            ],
-            "overlaps" : [
-                "LIBRARY_SUPPORT",
-                "GUESTGRAAL_LIBRARY"
-            ],
-            "distDependencies": [
-                "SVM",
-                "sdk:JNIUTILS",
-                "sdk:NATIVEBRIDGE",
-            ],
-            "defaultBuild": False,
-            "maven": False,
-        },
-
         "GUESTGRAAL_LIBRARY": {
             "subDir": "src",
             "description" : "GuestGraal HotSpot Graal library support",

substratevm/src/com.oracle.svm.graal.hotspot.guestgraal/src/com/oracle/svm/graal/hotspot/guestgraal/GuestGraal.java

@@ -99,6 +99,11 @@
  */
 final class GuestGraal {
 
+    /*
+     * See jdk.graal.compiler.hotspot.guestgraal.BuildTime.getRuntimeHandles to see how these
+     * handles are initialized and what their target methods are.
+     */
+
     private final MethodHandle getJNIEnv;
     private final MethodHandle getSavedProperty;
     private final MethodHandle ttyPrintf;
@@ -239,9 +244,6 @@ private static long compileMethod(JNIEnv jniEnv,
                     long timeAndMemBufferAddress,
                     long profilePathBufferAddress) {
         try (JNIMethodScope jniScope = new JNIMethodScope("compileMethod", jniEnv)) {
-            if (methodHandle == 0L) {
-                return 0L;
-            }
             String profileLoadPath;
             if (profilePathBufferAddress > 0) {
                 profileLoadPath = CTypeConversion.toJavaString(WordFactory.pointer(profilePathBufferAddress));

substratevm/src/com.oracle.svm.graal.hotspot.guestgraal/src/com/oracle/svm/graal/hotspot/guestgraal/GuestGraalFeature.java

@@ -48,7 +48,7 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.graal.hotspot.GetCompilerConfig;
 import com.oracle.svm.graal.hotspot.GetJNIConfig;
-import com.oracle.svm.hosted.FeatureImpl;
+import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
 import jdk.graal.compiler.options.OptionDescriptor;
 import jdk.graal.compiler.options.OptionKey;
 import jdk.graal.compiler.serviceprovider.LibGraalService;
@@ -397,13 +397,17 @@ public void beforeAnalysis(BeforeAnalysisAccess baa) {
             List<Class<?>> serviceClasses = impl.getImageClassLoader().findAnnotatedClasses(LibGraalService.class, false);
             serviceClasses.stream().map(c -> loader.loadClassOrFail(c.getName())).forEach(guestServiceClasses::add);
 
+            // Transfer libgraal qualifier (e.g. "PGO optimized") from host to guest.
+            String nativeImageLocationQualifier = CompilerConfigurationFactory.getNativeImageLocationQualifier();
+
             MethodHandle configureGraalForLibGraal = mhl.findStatic(buildTimeClass,
                             "configureGraalForLibGraal",
                             methodType(void.class,
                                             String.class, // arch
                                             List.class, // guestServiceClasses
                                             Consumer.class, // registerAsInHeap
                                             Consumer.class, // hostedGraalSetFoldNodePluginClasses
+                                            String.class, // nativeImageLocationQualifier
                                             String.class // encodedGuestObjects
                             ));
             GetCompilerConfig.Result configResult = GetCompilerConfig.from(Options.GuestJavaHome.getValue(), bb.getOptions());
@@ -417,6 +421,7 @@ public void beforeAnalysis(BeforeAnalysisAccess baa) {
                             guestServiceClasses,
                             registerAsInHeap,
                             hostedGraalSetFoldNodePluginClasses,
+                            nativeImageLocationQualifier,
                             configResult.encodedConfig());
 
             initGraalRuntimeHandles(mhl.findStatic(buildTimeClass, "getRuntimeHandles", methodType(Map.class)));
@@ -461,7 +466,7 @@ public void afterAnalysis(AfterAnalysisAccess access) {
                         classesPattern("jdk.graal.compiler.options",
                                         "ModifiableOptionValues", "Option.*"),
                         classesPattern("jdk.graal.compiler.util.json",
-                                        "JsonWriter"),
+                                        "JsonWriter", "JsonBuilder.*"),
                         classesPattern("org.graalvm.collections",
                                         "EconomicMap.*", "EmptyMap.*", "Equivalence.*", "Pair"),
                         classesPattern("jdk.vm.ci.amd64",
@@ -502,26 +507,12 @@ public void afterAnalysis(AfterAnalysisAccess access) {
             }
         }
         if (!forbiddenReachableTypes.isEmpty()) {
+            CallTreePrinter.print(bigBang, "reports", "report");
             VMError.shouldNotReachHere("GuestGraal build found forbidden hosted types as reachable: %s", String.join(", ", forbiddenReachableTypes));
         }
         optionCollector.afterAnalysis(access);
     }
 
-    @Override
-    public void beforeImageWrite(BeforeImageWriteAccess access) {
-        if (!Platform.includedIn(Platform.WINDOWS.class)) {
-            ((FeatureImpl.BeforeImageWriteAccessImpl) access).registerLinkerInvocationTransformer(linkerInvocation -> {
-                Path imageFilePath = linkerInvocation.getOutputFile();
-                String imageName = imageFilePath.getFileName().toString();
-                String posixLibraryPrefix = "lib";
-                assert !imageName.startsWith(posixLibraryPrefix);
-                String posixImageName = posixLibraryPrefix + imageName;
-                linkerInvocation.setOutputFile(imageFilePath.getParent().resolve(posixImageName));
-                return linkerInvocation;
-            });
-        }
-    }
-
     private static Pattern classesPattern(String packageName, String... regexes) {
         return Pattern.compile("%s(%s)".formatted(Pattern.quote(packageName + '.'), String.join("|", regexes)));
     }