[GR-69677] Restore JDK dependency to version 25

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": "26",      "build_id": "jdk-26+11-1117", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+26-3319", "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 },
@@ -54,13 +54,13 @@
     "labsjdk-ee-25-llvm": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
     "graalvm-ee-25-ea":   {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+13", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+13-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+13-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+13-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+13-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+13-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+13-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+37", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+37-jvmci-b02", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+37-jvmci-b02-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+37-jvmci-b02-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+37-jvmci-b02", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+37-jvmci-b02-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+37-jvmci-b02-sulong", "platformspecific": true }
   },
 
   "eclipse": {

compiler/ci/ci_common/gate.jsonnet

@@ -550,7 +550,8 @@
   local style_builds = [self.make_build(self.jdk_latest, "linux-amd64", "style").build + {
       environment+: {
         # Run the strict JVMCI version check, i.e., that JVMCIVersionCheck.JVMCI_MIN_VERSION matches the versions in common.json.
-        JVMCI_VERSION_CHECK: "strict",
+        # temporarily disable until labsjdk-ce|ee-25 is gone from common.json
+        # JVMCI_VERSION_CHECK: "strict",
       },
   }],
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, 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

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 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
@@ -40,7 +40,7 @@ public class HotSpotCompressedKlassPointerTest extends HotSpotGraalCompilerTest
     @Before
     public void setUp() {
         GraalHotSpotVMConfig config = runtime().getVMConfig();
-        assumeTrue("compressed class pointers specific tests", config.useCompressedClassPointers && !config.useClassMetaspaceForAllClasses);
+        assumeTrue("compressed class pointers specific tests", config.useCompressedClassPointers);
     }
 
     // Non-abstract class

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

@@ -28,15 +28,23 @@
 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.test/src/jdk/graal/compiler/hotspot/test/RangeCheckPredicatesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_getfield1.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, 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
@@ -26,9 +26,10 @@
  */
 package jdk.graal.compiler.jtt.except;
 
+import org.junit.Test;
+
 import jdk.graal.compiler.jtt.JTTTest;
 import jdk.graal.compiler.phases.OptimisticOptimizations;
-import org.junit.Test;
 
 public class BC_getfield1 extends JTTTest {
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_pow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2023, 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
@@ -24,10 +24,10 @@
  */
 package jdk.graal.compiler.jtt.lang;
 
-import jdk.graal.compiler.jtt.JTTTest;
-import jdk.graal.compiler.options.OptionValues;
 import org.junit.Test;
 
+import jdk.graal.compiler.jtt.JTTTest;
+import jdk.graal.compiler.options.OptionValues;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /*

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/UnaryMath.java

@@ -26,7 +26,6 @@
 
 import jdk.graal.compiler.jtt.JTTTest;
 import jdk.graal.compiler.options.OptionValues;
-
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 public abstract class UnaryMath extends JTTTest {

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CountPositivesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EncodeArrayTest.java

@@ -67,7 +67,7 @@ private static Result executeCompiledMethod(InstalledCode compiledMethod, Object
     @Test
     public void testStringCodingISO() throws ClassNotFoundException {
         Class<?> klass = Class.forName("java.lang.StringCoding");
-        ResolvedJavaMethod method = getResolvedJavaMethod(klass, "encodeISOArray0");
+        ResolvedJavaMethod method = getResolvedJavaMethod(klass, "implEncodeISOArray");
         StructuredGraph graph = getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), StructuredGraph.AllowAssumptions.YES, null);
         InstalledCode compiledMethod = getCode(method, graph);
 
@@ -100,7 +100,7 @@ public void testStringCodingISO() throws ClassNotFoundException {
     @Test
     public void testStringCodingAscii() throws ClassNotFoundException {
         Class<?> klass = Class.forName("java.lang.StringCoding");
-        ResolvedJavaMethod method = getResolvedJavaMethod(klass, "encodeAsciiArray0");
+        ResolvedJavaMethod method = getResolvedJavaMethod(klass, "implEncodeAsciiArray");
         StructuredGraph graph = getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), StructuredGraph.AllowAssumptions.YES, null);
         InstalledCode compiledMethod = getCode(method, graph);
 
@@ -133,7 +133,7 @@ public void testStringCodingAscii() throws ClassNotFoundException {
     @Test
     public void testISOEncoding() throws ClassNotFoundException {
         Class<?> klass = Class.forName("sun.nio.cs.ISO_8859_1$Encoder");
-        ResolvedJavaMethod method = getResolvedJavaMethod(klass, "encodeISOArray0");
+        ResolvedJavaMethod method = getResolvedJavaMethod(klass, "implEncodeISOArray");
         StructuredGraph graph = getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), StructuredGraph.AllowAssumptions.YES, null);
         InstalledCode compiledMethod = getCode(method, graph);
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StandardMethodSubstitutionsTest.java

@@ -60,9 +60,6 @@ public void testMathSubstitutions() {
         testGraph("mathSqrt");
         testGraph("mathTan");
         testGraph("mathAll");
-        if (getReplacements().hasSubstitution(getResolvedJavaMethod(Math.class, "sinh"), getInitialOptions())) {
-            testGraph("mathSinh");
-        }
         if (getReplacements().hasSubstitution(getResolvedJavaMethod(Math.class, "tanh"), getInitialOptions())) {
             testGraph("mathTanh");
         }
@@ -75,7 +72,6 @@ public void testMathSubstitutions() {
         test("mathLog", value);
         test("mathLog10", value);
         test("mathSin", value);
-        test("mathSinh", value);
         test("mathSqrt", value);
         test("mathTan", value);
         test("mathTanh", value);
@@ -137,10 +133,6 @@ public static double mathSin(double value) {
         return Math.sin(value);
     }
 
-    public static double mathSinh(double value) {
-        return Math.sinh(value);
-    }
-
     public static double mathCos(double value) {
         return Math.cos(value);
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64Assembler.java

@@ -138,7 +138,6 @@
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.REVW;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.REVX;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.RORV;
-import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SB;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBC;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBCS;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBFM;
@@ -1058,7 +1057,6 @@ public enum Instruction {
         MSR(0xD5100000),
         DC(0xD5087000),
         ISB(0x000000C0),
-        SB(0x000000E0),
 
         PACIA(0b00001 << 16 | 0b000000 << 10),
         AUTIA(0b00001 << 16 | 0b000100 << 10),
@@ -4036,15 +4034,6 @@ public enum BarrierKind {
         }
     }
 
-    /**
-     * C6.2.75 Data Cache operation.
-     */
-    public void dc(DataCacheOperationType type, Register src) {
-        assert verifyRegistersR(src);
-
-        emitInt(DC.encoding | type.encoding() | rt(src));
-    }
-
     /**
      * C6.2.80 Data Memory Barrier.
      *
@@ -4093,12 +4082,12 @@ public void msr(SystemRegister systemRegister, Register src) {
     }
 
     /**
-     * C6.2.230 Speculation barrier.
+     * C6.2.75 Data Cache operation.
      */
-    public void sb() {
-        if (supports(CPUFeature.SB)) {
-            emitInt(SB.encoding | BarrierOp);
-        }
+    public void dc(DataCacheOperationType type, Register src) {
+        assert verifyRegistersR(src);
+
+        emitInt(DC.encoding | type.encoding() | rt(src));
     }
 
     public void annotatePatchingImmediate(int pos, Instruction instruction, int operandSizeBits, int offsetBits, int shift) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64Assembler.java

@@ -950,24 +950,22 @@ public final void emit(AMD64Assembler asm, OperandSize size, Register dst, int i
 
     public static class SSERMIOp extends AMD64RMIOp {
         // @formatter:off
-        public static final SSERMIOp ROUNDSS       = new SSERMIOp("ROUNDSS",       true, P_0F3A,       0x0A, PreferredNDS.SRC,  OpAssertion.PackedDoubleAssertion,           CPUFeature.SSE4_1);
-        public static final SSERMIOp ROUNDSD       = new SSERMIOp("ROUNDSD",       true, P_0F3A,       0x0B, PreferredNDS.SRC,  OpAssertion.PackedDoubleAssertion,           CPUFeature.SSE4_1);
+        public static final SSERMIOp ROUNDSS       = new SSERMIOp("ROUNDSS",       true, P_0F3A,       0x0A, PreferredNDS.SRC, OpAssertion.PackedDoubleAssertion, CPUFeature.SSE4_1);
+        public static final SSERMIOp ROUNDSD       = new SSERMIOp("ROUNDSD",       true, P_0F3A,       0x0B, PreferredNDS.SRC, OpAssertion.PackedDoubleAssertion, CPUFeature.SSE4_1);
 
-        public static final SSERMIOp PCMPESTRI     = new SSERMIOp("PCMPESTRI",     true, P_0F3A,       0x61, PreferredNDS.NONE, OpAssertion.PackedDoubleAssertion,           CPUFeature.SSE4_2);
-        public static final SSERMIOp PCLMULQDQ     = new SSERMIOp("PCLMULQDQ",     true, P_0F3A,       0x44, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion,           CPUFeature.CLMUL);
-        public static final SSERMIOp GF2P8AFFINEQB = new SSERMIOp("GF2P8AFFINEQB", true, P_0F3A, true, 0xCE, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion,           CPUFeature.GFNI);
+        public static final SSERMIOp PCMPESTRI     = new SSERMIOp("PCMPESTRI",     true, P_0F3A,       0x61, PreferredNDS.NONE, OpAssertion.PackedDoubleAssertion, CPUFeature.SSE4_2);
+        public static final SSERMIOp PCLMULQDQ     = new SSERMIOp("PCLMULQDQ",     true, P_0F3A,       0x44, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion, CPUFeature.CLMUL);
+        public static final SSERMIOp GF2P8AFFINEQB = new SSERMIOp("GF2P8AFFINEQB", true, P_0F3A, true, 0xCE, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion, CPUFeature.GFNI);
 
         public static final SSERMIOp PINSRB        = new SSERMIOp("PINSRB",        true, P_0F3A,       0x20, PreferredNDS.DST,  OpAssertion.PackedDoubleIntToFloatAssertion, CPUFeature.SSE4_1);
         public static final SSERMIOp PINSRW        = new SSERMIOp("PINSRW",        true,   P_0F,       0xC4, PreferredNDS.DST,  OpAssertion.PackedDoubleIntToFloatAssertion, CPUFeature.SSE2);
         public static final SSERMIOp PINSRD        = new SSERMIOp("PINSRD",        true, P_0F3A,       0x22, PreferredNDS.DST,  OpAssertion.PackedDoubleIntToFloatAssertion, CPUFeature.SSE4_1);
         public static final SSERMIOp PINSRQ        = new SSERMIOp("PINSRQ",        true, P_0F3A, true, 0x22, PreferredNDS.DST,  OpAssertion.PackedDoubleIntToFloatAssertion, CPUFeature.SSE4_1);
 
-        public static final SSERMIOp PALIGNR       = new SSERMIOp("PALIGNR",       true, P_0F3A,       0x0F, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion,           CPUFeature.SSSE3);
-        public static final SSERMIOp PBLENDW       = new SSERMIOp("PBLENDW",       true, P_0F3A,       0x0E, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion,           CPUFeature.SSE4_1);
-        public static final SSERMIOp PSHUFD        = new SSERMIOp("PSHUFD",        true, P_0F,         0x70, PreferredNDS.NONE, OpAssertion.PackedDoubleAssertion,           CPUFeature.SSE2);
-        public static final SSERMIOp PSHUFLW       = new SSERMIOp("PSHUFLW",       true, P_0F,         0x70, PreferredNDS.NONE, OpAssertion.DoubleAssertion,                 CPUFeature.SSE2);
-
-        public static final SSERMIOp SHUFPD        = new SSERMIOp("SHUFPD",        true, P_0F,         0xC6, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion,           CPUFeature.SSE2);
+        public static final SSERMIOp PALIGNR       = new SSERMIOp("PALIGNR",       true, P_0F3A,       0x0F, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion, CPUFeature.SSSE3);
+        public static final SSERMIOp PBLENDW       = new SSERMIOp("PBLENDW",       true, P_0F3A,       0x0E, PreferredNDS.DST,  OpAssertion.PackedDoubleAssertion, CPUFeature.SSE4_1);
+        public static final SSERMIOp PSHUFD        = new SSERMIOp("PSHUFD",        true, P_0F,         0x70, PreferredNDS.NONE,  OpAssertion.PackedDoubleAssertion, CPUFeature.SSE2);
+        public static final SSERMIOp PSHUFLW       = new SSERMIOp("PSHUFLW",       true, P_0F,         0x70, PreferredNDS.NONE,  OpAssertion.DoubleAssertion, CPUFeature.SSE2);
         // @formatter:on
 
         private final PreferredNDS preferredNDS;
@@ -5691,10 +5689,6 @@ public final void psubusw(Register dst, AMD64Address src) {
         SSEOp.PSUBUSW.emit(this, OperandSize.PD, dst, src);
     }
 
-    public final void psubw(Register dst, Register src) {
-        SSEOp.PSUBW.emit(this, OperandSize.PD, dst, src);
-    }
-
     public final void ptest(Register dst, Register src) {
         SSEOp.PTEST.emit(this, OperandSize.PD, dst, src);
     }
@@ -5865,10 +5859,6 @@ public final void shrq(Register dst) {
         AMD64MOp.SHR.emit(this, OperandSize.QWORD, dst);
     }
 
-    public final void shufpd(Register dst, Register src, int imm8) {
-        SSERMIOp.SHUFPD.emit(this, OperandSize.PD, dst, src, imm8);
-    }
-
     public final void sqrtsd(Register dst, Register src) {
         SSEOp.SQRT.emit(this, OperandSize.SD, dst, src);
     }