Merge commit '0a2620a8a2f' into labsjdk/adopt-26+5-master

Author: jovanstevanovic

common.json

@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+4-323", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+5-361", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },

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

@@ -28,23 +28,15 @@
 import static jdk.graal.compiler.api.directives.GraalDirectives.deoptimize;
 import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability;
 
-import org.junit.Assume;
-import org.junit.Before;
 import org.junit.Test;
 
 import jdk.graal.compiler.api.directives.GraalDirectives;
-import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil;
 
 /**
  * Tests that PEA preserves the monitorenter order. This is essential for lightweight locking.
  */
 public final class MonitorPEATest extends HotSpotGraalCompilerTest {
 
-    @Before
-    public void checkUseLightweightLocking() {
-        Assume.assumeTrue(HotSpotReplacementsUtil.useLightweightLocking(runtime().getVMConfig()));
-    }
-
     static int staticInt = 0;
     static Object staticObj;
     static Object staticObj1;

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

@@ -135,16 +135,6 @@ private HotSpotGraalRuntime.HotSpotGC getSelectedGC() throws GraalError {
     public final boolean printInlining = getFlag("PrintInlining", Boolean.class);
     public final boolean inline = getFlag("Inline", Boolean.class);
 
-    // There are 3 available locking modes:
-    // LM_MONITOR uses only heavy monitors for locking;
-    // LM_LEGACY uses stack-locking, with monitors as 2nd tier;
-    // LM_LIGHTWEIGHT uses thread-local space for storing locked objects. This avoids the overload
-    // of the mark word.
-    public final int lockingMode = getFlag("LockingMode", Integer.class);
-
-    public final int lockingModeStack = getConstant("LockingMode::LM_LEGACY", Integer.class);
-    public final int lockingModeLightweight = getConstant("LockingMode::LM_LIGHTWEIGHT", Integer.class);
-
     public final boolean foldStableValues = getFlag("FoldStableValues", Boolean.class);
     public final int maxVectorSize = getFlag("MaxVectorSize", Integer.class);
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java

@@ -35,7 +35,6 @@
 import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HUB_LOCATION;
 import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HUB_WRITE_LOCATION;
 import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION;
-import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.useLightweightLocking;
 import static org.graalvm.word.LocationIdentity.any;
 
 import java.util.Arrays;
@@ -330,7 +329,7 @@ public void initialize(OptionValues options, Iterable<DebugHandlersFactory> fact
         assert target == providers.getCodeCache().getTarget() : Assertions.errorMessage(target, providers.getCodeCache().getTarget());
         instanceofSnippets = new InstanceOfSnippets.Templates(options, runtime, providers);
         allocationSnippets = allocationSnippetTemplates;
-        monitorSnippets = new MonitorSnippets.Templates(options, runtime, providers, config);
+        monitorSnippets = new MonitorSnippets.Templates(options, runtime, providers);
         g1WriteBarrierSnippets = new HotSpotG1WriteBarrierSnippets.Templates(options, runtime, providers, config);
         serialWriteBarrierSnippets = new HotSpotSerialWriteBarrierSnippets.Templates(options, runtime, providers);
         exceptionObjectSnippets = new LoadExceptionObjectSnippets.Templates(options, providers);
@@ -397,14 +396,11 @@ public MonitorSnippets.Templates getMonitorSnippets() {
     @Override
     protected FixedWithNextNode maybeEmitLockingCheck(List<MonitorIdNode> locks, FixedWithNextNode insertionPoint, FrameState stateBefore) {
         if (!locks.isEmpty()) {
-            if (useLightweightLocking(getVMConfig())) {
-                StructuredGraph graph = insertionPoint.graph();
-                CheckFastPathMonitorEnterNode check = graph.add(new CheckFastPathMonitorEnterNode(locks));
-                graph.addAfterFixed(insertionPoint, check);
-                check.setStateBefore(stateBefore.duplicate());
-                return check;
-            }
-            // The stack lock and heavyweight monitors cases don't need any checks.
+            StructuredGraph graph = insertionPoint.graph();
+            CheckFastPathMonitorEnterNode check = graph.add(new CheckFastPathMonitorEnterNode(locks));
+            graph.addAfterFixed(insertionPoint, check);
+            check.setStateBefore(stateBefore.duplicate());
+            return check;
         }
         return insertionPoint;
     }
@@ -530,7 +526,7 @@ private boolean lowerWithoutDelegation(Node n, LoweringTool tool) {
             }
         } else if (n instanceof CheckFastPathMonitorEnterNode) {
             if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                monitorSnippets.lower((CheckFastPathMonitorEnterNode) n, registers, runtime.getVMConfig(), tool);
+                monitorSnippets.lower((CheckFastPathMonitorEnterNode) n, registers, tool);
             }
         } else if (n instanceof MonitorExitNode) {
             if (graph.getGuardsStage().areFrameStatesAtDeopts()) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotPlatformConfigurationProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 package jdk.graal.compiler.hotspot.meta;
 
 import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
-import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil;
 import jdk.graal.compiler.nodes.gc.BarrierSet;
 import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
 
@@ -34,12 +33,9 @@ public class HotSpotPlatformConfigurationProvider implements PlatformConfigurati
 
     private final boolean canVirtualizeLargeByteArrayAccess;
 
-    private final boolean useLightweightLocking;
-
     public HotSpotPlatformConfigurationProvider(GraalHotSpotVMConfig config, BarrierSet barrierSet) {
         this.barrierSet = barrierSet;
         this.canVirtualizeLargeByteArrayAccess = config.deoptimizationSupportLargeAccessByteArrayVirtualization;
-        this.useLightweightLocking = HotSpotReplacementsUtil.useLightweightLocking(config);
     }
 
     @Override
@@ -49,7 +45,7 @@ public boolean canVirtualizeLargeByteArrayAccess() {
 
     @Override
     public boolean requiresStrictLockOrder() {
-        return useLightweightLocking;
+        return true;
     }
 
     @Override

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java

@@ -34,8 +34,6 @@
 import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.markWordLockMaskInPlace;
 import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.monitorValue;
 import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.uninitializedIdentityHashCodeValue;
-import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.unlockedValue;
-import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.useLightweightLocking;
 import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.useObjectMonitorTable;
 import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
 import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
@@ -75,9 +73,7 @@ protected int computeIdentityHashCode(final Object x) {
         //
         // See src/hotspot/share/oops/markWord.hpp for more details.
         final Word lockBits = mark.and(Word.unsigned(markWordLockMaskInPlace(INJECTED_VMCONFIG)));
-        if (useObjectMonitorTable(INJECTED_VMCONFIG) || probability(FAST_PATH_PROBABILITY,
-                        useLightweightLocking(INJECTED_VMCONFIG) ? lockBits.notEqual(Word.unsigned(monitorValue(INJECTED_VMCONFIG)))
-                                        : lockBits.equal(Word.unsigned(unlockedValue(INJECTED_VMCONFIG))))) {
+        if (useObjectMonitorTable(INJECTED_VMCONFIG) || probability(FAST_PATH_PROBABILITY, lockBits.notEqual(Word.unsigned(monitorValue(INJECTED_VMCONFIG))))) {
             // `& markWord::hash_mask' is essential with -XX:+UseCompactObjectHeaders, because bit
             // 42 might be set.
             int hash = (int) mark.unsignedShiftRight(markWordHashCodeShift(INJECTED_VMCONFIG)).and((int) markWordHashMark(INJECTED_VMCONFIG)).rawValue();

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotReplacementsUtil.java

@@ -535,16 +535,6 @@ public static void initializeObjectHeader(Word memory, Word markWord, KlassPoint
         }
     }
 
-    @Fold
-    public static boolean useStackLocking(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.lockingMode == config.lockingModeStack;
-    }
-
-    @Fold
-    public static boolean useLightweightLocking(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.lockingMode == config.lockingModeLightweight;
-    }
-
     @Fold
     public static boolean useObjectMonitorTable(@InjectedParameter GraalHotSpotVMConfig config) {
         return config.useObjectMonitorTable;