Merge branch 'master' into labsjdk/adopt-24+26-master

Author: tzezula

common.json

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

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CheckGraalInvariants.java

@@ -84,6 +84,7 @@
 import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 import jdk.graal.compiler.nodes.memory.MemoryKill;
 import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
 import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
@@ -101,6 +102,7 @@
 import jdk.graal.compiler.phases.tiers.HighTierContext;
 import jdk.graal.compiler.phases.util.Providers;
 import jdk.graal.compiler.runtime.RuntimeProvider;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 import jdk.graal.compiler.test.AddExports;
 import jdk.graal.compiler.test.SubprocessUtil;
 import jdk.internal.misc.Unsafe;
@@ -195,8 +197,11 @@ public boolean shouldVerifyFoldableMethods() {
             return true;
         }
 
-        public boolean shouldVerifyCurrentTimeMillis() {
-            return true;
+        public void verifyCurrentTimeMillis(MetaAccessProvider meta, MethodCallTargetNode t, ResolvedJavaType declaringClass) {
+            final ResolvedJavaType services = meta.lookupJavaType(GraalServices.class);
+            if (!declaringClass.equals(services)) {
+                throw new VerificationError(t, "Should use System.nanoTime() for measuring elapsed time or GraalServices.milliTimeStamp() for the time since the epoch");
+            }
         }
 
         /**
@@ -366,9 +371,7 @@ public static void runTest(InvariantsTool tool) {
             verifiers.add(foldableMethodsVerifier);
         }
 
-        if (tool.shouldVerifyCurrentTimeMillis()) {
-            verifiers.add(new VerifyCurrentTimeMillisUsage());
-        }
+        verifiers.add(new VerifyCurrentTimeMillisUsage(tool));
 
         tool.updateVerifiers(verifiers);
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyCurrentTimeMillisUsage.java

@@ -24,6 +24,7 @@
  */
 package jdk.graal.compiler.core.test;
 
+import jdk.graal.compiler.core.test.CheckGraalInvariants.InvariantsTool;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 import jdk.graal.compiler.nodes.spi.CoreProviders;
@@ -40,6 +41,12 @@
 public class VerifyCurrentTimeMillisUsage extends VerifyPhase<CoreProviders> {
     private static final String CURRENT_TIME_MILLIS_NAME = "currentTimeMillis";
 
+    private final InvariantsTool tool;
+
+    public VerifyCurrentTimeMillisUsage(InvariantsTool tool) {
+        this.tool = tool;
+    }
+
     @Override
     protected void verify(StructuredGraph graph, CoreProviders context) {
         final ResolvedJavaType systemType = context.getMetaAccess().lookupJavaType(System.class);
@@ -48,11 +55,8 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
             if (callee.getDeclaringClass().equals(systemType)) {
                 String calleeName = callee.getName();
                 if (calleeName.equals(CURRENT_TIME_MILLIS_NAME)) {
-                    final ResolvedJavaType services = context.getMetaAccess().lookupJavaType(GraalServices.class);
-                    if (graph.method().getDeclaringClass().equals(services)) {
-                        return;
-                    }
-                    throw new VerificationError(t, "Should use System.nanoTime for measuring elapsed time or GraalServices.milliTimeStamp for the time since the epoch");
+                    final ResolvedJavaType declaringClass = graph.method().getDeclaringClass();
+                    tool.verifyCurrentTimeMillis(context.getMetaAccess(), t, declaringClass);
                 }
             }
         }

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

@@ -729,4 +729,26 @@ public static ReturnValue testOuterLockOptimizeToDeopt() {
         }
         return ret;
     }
+
+    @Test
+    @SuppressWarnings("try")
+    public void testLocksAtOSREntry() {
+        run(() -> {
+            OptionValues options = new OptionValues(getInitialOptions(), osrLockDeopt());
+            testOSR(options, "testLocksAtOSREntrySnippet", null, new Object(), false);
+        });
+    }
+
+    private static Object staticLock = new Object();
+
+    static synchronized Object testLocksAtOSREntrySnippet(Object object, boolean alwaysFalse) {
+        synchronized (staticLock) {
+            synchronized (object) {
+                while (GraalDirectives.injectBranchProbability(0.001, alwaysFalse)) {
+                    GraalDirectives.sideEffect();
+                }
+            }
+        }
+        return ReturnValue.SUCCESS;
+    }
 }