remove more older JDK support

Author: dougxc

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java

@@ -89,7 +89,6 @@ public CompressEncoding getKlassEncoding() {
     public final int hugeMethodLimit = getFlag("HugeMethodLimit", Integer.class);
     public final boolean printInlining = getFlag("PrintInlining", Boolean.class);
     public final boolean inline = getFlag("Inline", Boolean.class);
-    public final boolean inlineNotify = true;
     public final boolean useFastLocking = getFlag("JVMCIUseFastLocking", Boolean.class);
     public final boolean forceUnreachable = getFlag("ForceUnreachable", Boolean.class);
     public final boolean foldStableValues = getFlag("FoldStableValues", Boolean.class);
@@ -164,11 +163,11 @@ public boolean useSquareToLenIntrinsic() {
     }
 
     public boolean inlineNotify() {
-        return inlineNotify && notifyAddress != 0;
+        return notifyAddress != 0;
     }
 
     public boolean inlineNotifyAll() {
-        return inlineNotify && notifyAllAddress != 0;
+        return notifyAllAddress != 0;
     }
 
     public boolean useCRC32Intrinsics() {
@@ -233,13 +232,8 @@ public final int logMinObjAlignment() {
     public final int secondarySuperCacheOffset = getFieldOffset("Klass::_secondary_super_cache", Integer.class, "Klass*");
     public final int secondarySupersOffset = getFieldOffset("Klass::_secondary_supers", Integer.class, "Array<Klass*>*");
 
-    public final boolean classMirrorIsHandle;
-    public final int classMirrorOffset;
-    {
-        // JDK-8186777
-        classMirrorIsHandle = true;
-        classMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "OopHandle");
-    }
+    // JDK-8186777
+    public final int classMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "OopHandle");
 
     public final int klassSuperKlassOffset = getFieldOffset("Klass::_super", Integer.class, "Klass*");
     public final int klassModifierFlagsOffset = getFieldOffset("Klass::_modifier_flags", Integer.class, "jint");
@@ -301,20 +295,14 @@ private int getJvmciJvmtiCapabilityOffset(String name) {
     public final int javaThreadAnchorOffset = getFieldOffset("JavaThread::_anchor", Integer.class, "JavaFrameAnchor");
     public final int javaThreadShouldPostOnExceptionsFlagOffset = getFieldOffset("JavaThread::_should_post_on_exceptions_flag", Integer.class, "int");
 
-    public final boolean threadObjectFieldIsHandle;
     /**
      * The offset of the {@code JavaThread} field containing the reference to the current thread.
      */
     public final int threadCurrentThreadObjectOffset;
     {
-        if (JDK <= 15) {
-            threadObjectFieldIsHandle = false;
-            threadCurrentThreadObjectOffset = getFieldOffset("JavaThread::_threadObj", Integer.class, "oop");
-        } else if (JDK < 19) {
-            threadObjectFieldIsHandle = true;
+        if (JDK < 19) {
             threadCurrentThreadObjectOffset = getFieldOffset("JavaThread::_threadObj", Integer.class, "OopHandle");
         } else {
-            threadObjectFieldIsHandle = true;
             /*
              * With virtual threads, the value returned by Thread.currentThread() is the new
              * _vthread field. The _threadObj field is still present but refers to the carrier

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java

@@ -658,13 +658,11 @@ private void lowerHubGetClassNode(HubGetClassNode n, LoweringTool tool) {
         assert !hub.isConstant();
         AddressNode mirrorAddress = createOffsetAddress(graph, hub, vmConfig.classMirrorOffset);
         FloatingReadNode read = graph.unique(
-                        new FloatingReadNode(mirrorAddress, CLASS_MIRROR_LOCATION, null, vmConfig.classMirrorIsHandle ? StampFactory.forKind(target.wordJavaKind) : n.stamp(NodeView.DEFAULT),
+                        new FloatingReadNode(mirrorAddress, CLASS_MIRROR_LOCATION, null, StampFactory.forKind(target.wordJavaKind),
                                         null, BarrierType.NONE));
-        if (vmConfig.classMirrorIsHandle) {
-            // Read the Object from the OopHandle
-            AddressNode address = createOffsetAddress(graph, read, 0);
-            read = graph.unique(new FloatingReadNode(address, HOTSPOT_OOP_HANDLE_LOCATION, null, n.stamp(NodeView.DEFAULT), null, BarrierType.NONE));
-        }
+        // Read the Object from the OopHandle
+        AddressNode address = createOffsetAddress(graph, read, 0);
+        read = graph.unique(new FloatingReadNode(address, HOTSPOT_OOP_HANDLE_LOCATION, null, n.stamp(NodeView.DEFAULT), null, BarrierType.NONE));
         n.replaceAtUsagesAndDelete(read);
     }
 

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java

@@ -26,8 +26,8 @@
 
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_CURRENT_THREAD_OOP_HANDLE_LOCATION;
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CURRENT_THREAD_OBJECT_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_OSTHREAD_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION;
@@ -210,14 +210,13 @@ public ValueNode readCurrentThreadObject() {
     public ValueNode readCurrentThreadObject(CurrentJavaThreadNode thread) {
         // JavaThread::_threadObj is never compressed
         ObjectStamp threadStamp = StampFactory.objectNonNull(TypeReference.create(b.getAssumptions(), b.getMetaAccess().lookupJavaType(Thread.class)));
-        Stamp fieldStamp = config.threadObjectFieldIsHandle ? StampFactory.forKind(getWordKind()) : threadStamp;
+        Stamp fieldStamp = StampFactory.forKind(getWordKind());
         ValueNode value = readLocation(thread, HotSpotVMConfigField.JAVA_THREAD_THREAD_OBJECT, fieldStamp);
-        if (config.threadObjectFieldIsHandle) {
-            // Read the Object from the OopHandle
-            ValueNode handleOffset = ConstantNode.forIntegerKind(getWordKind(), 0, b.getGraph());
-            AddressNode handleAddress = b.add(new OffsetAddressNode(value, handleOffset));
-            value = b.add(new ReadNode(handleAddress, HOTSPOT_CURRENT_THREAD_OOP_HANDLE_LOCATION, threadStamp, BarrierType.NONE, MemoryOrderMode.PLAIN));
-        }
+
+        // Read the Object from the OopHandle
+        ValueNode handleOffset = ConstantNode.forIntegerKind(getWordKind(), 0, b.getGraph());
+        AddressNode handleAddress = b.add(new OffsetAddressNode(value, handleOffset));
+        value = b.add(new ReadNode(handleAddress, HOTSPOT_CURRENT_THREAD_OOP_HANDLE_LOCATION, threadStamp, BarrierType.NONE, MemoryOrderMode.PLAIN));
         return value;
     }