Resolved review comments.

Author: tzezula

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

@@ -62,6 +62,11 @@ public static void configureGraalForLibGraal() {
     /**
      * Obtains a {@link Lookup} instance for resolving method handles to invoke Graal and JVMCI
      * methods.
+     * <p>
+     * This method is invoked reflectively by {@code GuestGraalFeature.initializeTruffle()} in the
+     * native-image classloader to facilitate the exchange of lookup instances between the
+     * native-image classloader and the guest Graal classloader.
+     * </p>
      *
      * @param lookup a {@link Lookup} instance used to resolve handles for calling into the
      *            native-image host.
@@ -72,7 +77,10 @@ public static void configureGraalForLibGraal() {
      *         methods. The {@link Lookup} instance can be used to resolve the compiler entry
      *         methods within the provided class.
      */
-    public static Entry<Lookup, Class<?>> getLookup(Lookup lookup, Class<?> fromLibGraal, Class<?> nativeImageSupport) {
+    public static Entry<Lookup, Class<?>> initializeLookup(Lookup lookup, Class<?> fromLibGraal, Class<?> nativeImageSupport) {
+        if (hostLookup != null) {
+            throw new IllegalStateException("Host lookup has already been initialized. BuildTime.initializeLookup should only be called once during the native image build process.");
+        }
         hostLookup = Objects.requireNonNull(lookup, "lookup must be non null");
         truffleFromLibGraalStartPoint = Objects.requireNonNull(fromLibGraal, "fromLibGraal must be non null");
         nativeImageHostEntryPoint = Objects.requireNonNull(nativeImageSupport, "nativeImageSupport must be non null");
@@ -107,7 +115,7 @@ static MethodHandle getHostMethodHandleOrFail(String name) {
              * The getHostMethodHandleOrFail should never be called in the native-image execution
              * time.
              */
-            throw new IllegalStateException("Should not be reachable in the libgraal execution time");
+            throw new IllegalStateException("Should not be reachable at libgraal runtime");
         } else {
             /*
              * HS proxy classes and BuildTime are not used in Jargraal, but the CheckGraalInvariants

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/guestgraal/truffle/HSTruffleCompilerRuntime.java

@@ -115,7 +115,16 @@ public TruffleCompilable asCompilableTruffleAST(JavaConstant constant) {
         if (constant.isNull()) {
             return null;
         }
-        long jniLocalRef = HotSpotJVMCIRuntime.runtime().getJObjectValue((HotSpotObjectConstant) constant);
+        long jniLocalRef;
+        try {
+            jniLocalRef = HotSpotJVMCIRuntime.runtime().getJObjectValue((HotSpotObjectConstant) constant);
+        } catch (IllegalStateException ise) {
+            /*
+             * TODO: GR-57161: IllegalStateException: Cannot call getJObjectValue without Java frame
+             * anchor
+             */
+            return null;
+        }
         Object compilableHsHandle = NativeImageHostCalls.createLocalHandleForLocalReference(jniLocalRef);
         return compilableHsHandle == null ? null : new HSTruffleCompilable(compilableHsHandle);
     }

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

@@ -377,7 +377,13 @@ final class GuestGraalTruffleToLibGraalEntryPoints {
 
     private static volatile int lastJavaPCOffset = -1;
 
-    // The null MethodHandle values are overwritten reflectively in the constructor
+    /*
+     * Each of the following MethodHandle fields corresponds to a TruffleToLibGraal.Id value. The
+     * naming convention requires that each field name match the method name returned by
+     * TruffleToLibGraal.Id.getMethodName(). Additionally, the GraalEntryPoints method that the
+     * MethodHandle references must also follow this naming convention. The null MethodHandle values
+     * are overwritten reflectively in the constructor
+     */
     private final MethodHandle initializeIsolate = null;
     private final MethodHandle registerRuntime = null;
     private final MethodHandle initializeRuntime = null;
@@ -404,6 +410,7 @@ final class GuestGraalTruffleToLibGraalEntryPoints {
     private final MethodHandle getDataPatchesCount = null;
     private final MethodHandle purgePartialEvaluationCaches = null;
     private final MethodHandle getCompilerVersion = null;
+
     private final MethodHandle getCurrentJavaThread;
     private final MethodHandle getLastJavaPCOffset;
 
@@ -511,7 +518,7 @@ public static boolean registerRuntime(JNIEnv env, JClass hsClazz, @IsolateThread
     public static long initializeRuntime(JNIEnv env, JClass hsClazz, @IsolateThreadContext long isolateThreadId,
                     JObject truffleRuntime, JClass hsClassLoaderDelegate) {
         try (JNIMethodScope s = openScope(Id.InitializeRuntime, env)) {
-            HSObject hsHandle = new HSObject(env, truffleRuntime);
+            HSObject hsHandle = new HSObject(env, truffleRuntime, true, false);
             Object hsTruffleRuntime = singleton().initializeRuntime.invoke(hsHandle, hsClassLoaderDelegate.rawValue());
             return LibGraalObjectHandles.create(hsTruffleRuntime);
         } catch (Throwable t) {

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

@@ -434,7 +434,7 @@ private static void initGraalRuntimeHandles(MethodHandle getRuntimeHandles) thro
     @SuppressWarnings("unchecked")
     private void initializeTruffle() throws Throwable {
         Class<?> truffleBuildTimeClass = loader.loadClassOrFail("jdk.graal.compiler.hotspot.guestgraal.truffle.BuildTime");
-        MethodHandle getLookup = mhl.findStatic(truffleBuildTimeClass, "getLookup", methodType(Map.Entry.class, Lookup.class, Class.class, Class.class));
+        MethodHandle getLookup = mhl.findStatic(truffleBuildTimeClass, "initializeLookup", methodType(Map.Entry.class, Lookup.class, Class.class, Class.class));
         Map.Entry<Lookup, Class<?>> truffleGuestGraal = (Map.Entry<Lookup, Class<?>>) getLookup.invoke(mhl, TruffleFromLibGraalStartPoints.class, NativeImageHostEntryPoints.class);
         ImageSingletons.add(GuestGraalTruffleToLibGraalEntryPoints.class, new GuestGraalTruffleToLibGraalEntryPoints(truffleGuestGraal.getKey(), truffleGuestGraal.getValue()));
         MethodHandle truffleConfigureGraalForLibGraal = mhl.findStatic(truffleBuildTimeClass, "configureGraalForLibGraal", methodType(void.class));