[GR-65188] Remove JDK version checks in libgraal build time code.

PullRequest: graal/20955

Author: dougxc

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.55.2",
+  "mx_version": "7.55.4",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

compiler/mx.compiler/suite.py

@@ -486,6 +486,10 @@
       "annotationProcessors" : [
         "GRAAL_PROCESSOR",
       ],
+
+      # Direct reference to jdk.vm.ci.hotspot.CompilerThreadCanCallJavaScope
+      # causing spotbugs analysis to fail with "missing class" error.
+      "spotbugs": "false",
     },
 
     "jdk.graal.compiler.libgraal.loader" : {

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/LibGraalSupportImpl.java

@@ -24,12 +24,8 @@
  */
 package jdk.graal.compiler.libgraal;
 
-import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +53,7 @@
 import jdk.graal.compiler.libgraal.truffle.HSTruffleCompilerRuntime;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.word.Word;
+import jdk.vm.ci.hotspot.CompilerThreadCanCallJavaScope;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
 import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
@@ -229,7 +226,7 @@ public void initialize() {
     @Override
     @SuppressWarnings("try")
     public void shutdown(String callbackClassName, String callbackMethodName) {
-        try (CanCallJavaScope ignore = CanCallJavaScope.open()) {
+        try (CompilerThreadCanCallJavaScope ignore = new CompilerThreadCanCallJavaScope(true)) {
             if (callbackClassName != null) {
                 JNI.JNIEnv env = Word.unsigned(getJNIEnv());
                 JNI.JClass cbClass = JNIUtil.findClass(env, JNIUtil.getSystemClassLoader(env),
@@ -247,46 +244,6 @@ public void shutdown(String callbackClassName, String callbackMethodName) {
 
     }
 
-    private static final class CanCallJavaScope implements Closeable {
-
-        private static final MethodHandle CAN_CALL_JAVA_SCOPE = findCompilerThreadCanCallJavaScopeConstructor();
-
-        private static MethodHandle findCompilerThreadCanCallJavaScopeConstructor() {
-            try {
-                return MethodHandles.lookup().findConstructor(Class.forName("jdk.vm.ci.hotspot.CompilerThreadCanCallJavaScope"), MethodType.methodType(void.class, boolean.class));
-            } catch (ReflectiveOperationException e) {
-                throw new InternalError(e);
-            }
-        }
-
-        private final AutoCloseable impl;
-
-        private CanCallJavaScope() {
-            try {
-                impl = (AutoCloseable) CAN_CALL_JAVA_SCOPE.invoke(true);
-            } catch (Error | RuntimeException e) {
-                throw e;
-            } catch (Throwable throwable) {
-                throw new InternalError(throwable);
-            }
-        }
-
-        @Override
-        public void close() {
-            try {
-                impl.close();
-            } catch (RuntimeException e) {
-                throw e;
-            } catch (Exception e) {
-                throw new AssertionError(e);
-            }
-        }
-
-        static CanCallJavaScope open() {
-            return CAN_CALL_JAVA_SCOPE != null ? new CanCallJavaScope() : null;
-        }
-    }
-
     @Override
     public void notifyLowMemoryPoint(boolean suggestFullGC) {
         LibGraalRuntime.notifyLowMemoryPoint(suggestFullGC);

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/truffle/BinaryOutput.java

@@ -24,10 +24,10 @@
  */
 package jdk.graal.compiler.libgraal.truffle;
 
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.UnmanagedMemory;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
-import org.graalvm.word.WordFactory;
 
 import java.io.Closeable;
 import java.nio.ByteBuffer;
@@ -615,7 +615,7 @@ public void close() {
             if (unmanaged) {
                 UnmanagedMemory.free(address);
                 byteBufferView = null;
-                address = WordFactory.nullPointer();
+                address = Word.nullPointer();
                 length = 0;
                 unmanaged = false;
                 pos = Integer.MIN_VALUE;
@@ -639,7 +639,7 @@ private void ensureCapacity(int neededCapacity) {
                     throw new OutOfMemoryError();
                 }
                 if (unmanaged) {
-                    address = UnmanagedMemory.realloc(address, WordFactory.unsigned(newCapacity));
+                    address = UnmanagedMemory.realloc(address, Word.unsigned(newCapacity));
                 } else {
                     CCharPointer newAddress = UnmanagedMemory.malloc(newCapacity);
                     memcpy(newAddress, address, pos);

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/truffle/HSConsumer.java

@@ -28,11 +28,11 @@
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilerAssumptionDependency;
 import com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal;
+import jdk.graal.compiler.word.Word;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import org.graalvm.jniutils.HSObject;
 import org.graalvm.jniutils.JNI.JObject;
 import org.graalvm.jniutils.JNIMethodScope;
-import org.graalvm.word.WordFactory;
 
 import java.util.function.Consumer;
 
@@ -55,7 +55,7 @@ public void accept(OptimizedAssumptionDependency optimizedDependency) {
         JObject compilable;
         long installedCode;
         if (dependency == null) {
-            compilable = WordFactory.nullPointer();
+            compilable = Word.nullPointer();
             installedCode = 0;
         } else {
             TruffleCompilable ast = dependency.getCompilable();
@@ -64,7 +64,7 @@ public void accept(OptimizedAssumptionDependency optimizedDependency) {
                  * Compilable may be null if the compilation was triggered by a libgraal host
                  * compilation.
                  */
-                compilable = WordFactory.nullPointer();
+                compilable = Word.nullPointer();
             } else {
                 compilable = ((HSTruffleCompilable) dependency.getCompilable()).getHandle();
             }

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/truffle/HSTruffleCompilable.java

@@ -57,13 +57,13 @@
 import org.graalvm.jniutils.JNIMethodScope;
 import org.graalvm.jniutils.JNIUtil;
 import org.graalvm.nativeimage.StackValue;
-import org.graalvm.word.WordFactory;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal;
 
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.hotspot.HotSpotGraalServices;
+import jdk.graal.compiler.word.Word;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.SpeculationLog;
@@ -285,7 +285,7 @@ public boolean cancelCompilation(CharSequence reason) {
     @TruffleFromLibGraal(IsSameOrSplit)
     @Override
     public boolean isSameOrSplit(TruffleCompilable ast) {
-        JObject astHandle = ast == null ? WordFactory.nullPointer() : ((HSTruffleCompilable) ast).getHandle();
+        JObject astHandle = ast == null ? Word.nullPointer() : ((HSTruffleCompilable) ast).getHandle();
         return HSTruffleCompilableGen.callIsSameOrSplit(calls, env(), getHandle(), astHandle);
     }
 

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/truffle/HSTruffleCompilerRuntime.java

@@ -35,6 +35,7 @@
 import jdk.graal.compiler.libgraal.LibGraalFeature;
 import jdk.graal.compiler.serviceprovider.IsolateUtil;
 import jdk.graal.compiler.truffle.hotspot.HotSpotTruffleCompilationSupport;
+import jdk.graal.compiler.word.Word;
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotObjectConstant;
@@ -56,7 +57,6 @@
 import org.graalvm.jniutils.JNIUtil;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.type.CCharPointer;
-import org.graalvm.word.WordFactory;
 
 import java.util.Arrays;
 import java.util.function.Consumer;
@@ -123,7 +123,7 @@ public TruffleCompilable asCompilableTruffleAST(JavaConstant constant) {
         if (scope == null) {
             return null;
         }
-        JObject hsCompilable = WordFactory.pointer(HotSpotJVMCIRuntime.runtime().getJObjectValue((HotSpotObjectConstant) constant));
+        JObject hsCompilable = Word.pointer(HotSpotJVMCIRuntime.runtime().getJObjectValue((HotSpotObjectConstant) constant));
         return new HSTruffleCompilable(scope, hsCompilable, this);
     }
 

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java

@@ -28,14 +28,14 @@
 import jdk.graal.compiler.serviceprovider.GlobalAtomicLong;
 import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
 import jdk.graal.compiler.truffle.host.TruffleHostEnvironment.TruffleRuntimeScope;
+import jdk.graal.compiler.word.Word;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.jniutils.JNI.JClass;
 import org.graalvm.jniutils.JNI.JNIEnv;
 import org.graalvm.jniutils.JNI.JObject;
 import org.graalvm.jniutils.JNIMethodScope;
 import org.graalvm.jniutils.JNIUtil;
-import org.graalvm.word.WordFactory;
 
 /**
  * This handles the Truffle host environment lookup on HotSpot with Libgraal.
@@ -66,7 +66,7 @@ public TruffleHostEnvironment lookup(ResolvedJavaType forType) {
             return null;
         }
         JNIEnv env = JNIMethodScope.env();
-        JObject runtimeLocalRef = JNIUtil.NewLocalRef(env, WordFactory.pointer(globalReference));
+        JObject runtimeLocalRef = JNIUtil.NewLocalRef(env, Word.pointer(globalReference));
         if (runtimeLocalRef.isNull()) {
             // The Truffle runtime was collected by the GC
             return null;