Skip to content

[GR-66940] Update labsjdk to 26+5-jvmci-b01. #11559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 51 commits into from
Jul 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
6ecd5de
Automatic merge of master into galahad
OracleLabsAutomation Jun 26, 2025
e070623
Adapt JDK-8359437: Make users and test suite not able to set LockingM…
mur47x111 Jun 23, 2025
1b950b1
Update galahad JDK
mur47x111 Jun 23, 2025
1c570ad
[JDK-8360296] Adapt JDK-8359437: Make users and test suite not able t…
mur47x111 Jun 26, 2025
4bef36a
Automatic merge of master into galahad
OracleLabsAutomation Jun 26, 2025
69effed
Automatic merge of master into galahad
OracleLabsAutomation Jun 26, 2025
2ab93e1
Automatic merge of master into galahad
OracleLabsAutomation Jun 26, 2025
869a457
Automatic merge of master into galahad
OracleLabsAutomation Jun 26, 2025
e520790
Automatic merge of master into galahad
OracleLabsAutomation Jun 26, 2025
25a9505
Automatic merge of master into galahad
OracleLabsAutomation Jun 26, 2025
a3b8f41
Automatic merge of master into galahad
OracleLabsAutomation Jun 27, 2025
52e7e6e
Automatic merge of master into galahad
OracleLabsAutomation Jun 27, 2025
edc18b9
Automatic merge of master into galahad
OracleLabsAutomation Jun 27, 2025
1177e3d
Adapt JDK-8359435: AArch64: add support for SB instruction to MacroAs…
mur47x111 Jun 27, 2025
17b4e1d
Update galahad jdk
mur47x111 Jun 27, 2025
c957bfe
[JDK-8360881] Adapt JDK-8359435: AArch64: add support for SB instruct…
mur47x111 Jun 27, 2025
84529b8
Automatic merge of master into galahad
OracleLabsAutomation Jun 27, 2025
86b3a41
Automatic merge of master into galahad
OracleLabsAutomation Jun 27, 2025
359e5b0
Automatic merge of master into galahad
OracleLabsAutomation Jun 28, 2025
6ec2949
Automatic merge of master into galahad
OracleLabsAutomation Jun 29, 2025
5f656fd
Automatic merge of master into galahad
OracleLabsAutomation Jun 29, 2025
f722a2e
Automatic merge of master into galahad
OracleLabsAutomation Jun 30, 2025
c289a2f
Automatic merge of master into galahad
OracleLabsAutomation Jun 30, 2025
af5bb94
Automatic merge of master into galahad
OracleLabsAutomation Jun 30, 2025
78c4ca9
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
0dc1b3e
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
19261e0
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
bd97f13
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
08c05e0
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
e7d8266
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
766876e
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
2ed7a2d
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
cb2b528
Automatic merge of master into galahad
OracleLabsAutomation Jul 1, 2025
9a9f62b
Automatic merge of master into galahad
OracleLabsAutomation Jul 2, 2025
b75c10e
Automatic merge of master into galahad
OracleLabsAutomation Jul 2, 2025
a5a2fdf
Automatic merge of master into galahad
OracleLabsAutomation Jul 2, 2025
f92ea3f
Automatic merge of master into galahad
OracleLabsAutomation Jul 2, 2025
fb56888
Automatic merge of master into galahad
OracleLabsAutomation Jul 2, 2025
d4d6613
Merge master into galahad
mur47x111 Jul 3, 2025
0a2620a
[GR-66927] Merge master to galahad
mur47x111 Jul 3, 2025
1313de3
update JVMCI to 26+5-jvmci-b01
OracleLabsAutomation Jul 3, 2025
dccd158
Merge commit '0a2620a8a2f' into labsjdk/adopt-26+5-master
jovanstevanovic Jul 4, 2025
f00aa9b
Update BasedOnJDK annotations (incomplete).
jovanstevanovic Jul 4, 2025
484060c
Update BasedOnJDK annotation (incomplete).
jovanstevanovic Jul 4, 2025
e9c0785
Update JVMCI version.
jovanstevanovic Jul 4, 2025
5ff85f1
deploy labsjdk snapshots
marwan-hallaoui Jul 4, 2025
2366b22
get deoptimization count only on default compilation
mur47x111 Jul 4, 2025
0f186f0
Merge branch 'master' into labsjdk/adopt-26+5-master
jovanstevanovic Jul 6, 2025
9c4c400
Fix a merge conflict with master.
jovanstevanovic Jul 6, 2025
e4b8718
invalidate compilation that was installed as default after test
mur47x111 Jul 6, 2025
af059cb
Update BasedOnJDK annotations.
jovanstevanovic Jul 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions common.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -53,13 +53,13 @@
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-sulong", "platformspecific": true },

"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+4", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+4-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+4-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+4-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+4-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+4-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+4-jvmci-b01-sulong", "platformspecific": true }
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+5", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01-sulong", "platformspecific": true }
},

"eclipse": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 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
Expand All @@ -24,18 +24,18 @@
*/
package jdk.graal.compiler.core.test;

import java.util.Collections;
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.Formatter;
import java.util.Map;
import java.util.Set;

import org.junit.Test;

import jdk.graal.compiler.api.directives.GraalDirectives;
import jdk.graal.compiler.core.common.GraalOptions;
import jdk.graal.compiler.options.OptionValues;
import jdk.graal.compiler.phases.OptimisticOptimizations;
import org.junit.Test;

import jdk.vm.ci.meta.DeoptimizationReason;
import jdk.vm.ci.meta.ProfilingInfo;
import jdk.vm.ci.meta.ResolvedJavaMethod;
Expand Down Expand Up @@ -121,7 +121,7 @@ public void testDownOverflow() {
// first should deopt with a failed speculation, second not
Map<DeoptimizationReason, Integer> deoptCountsBefore = getDeoptCounts(method);
try {
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, Collections.emptySet(), null);
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, true, Set.of(), null);
deoptCountsBefore = getDeoptCounts(method);
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, EnumSet.allOf(DeoptimizationReason.class), null);
} catch (Throwable t) {
Expand All @@ -142,7 +142,7 @@ public void testDownOverflowUnsigned() {
// first should deopt with a failed speculation, second not
Map<DeoptimizationReason, Integer> deoptCountsBefore = getDeoptCounts(method);
try {
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, Collections.emptySet(), null);
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, true, Set.of(), null);
deoptCountsBefore = getDeoptCounts(method);
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, EnumSet.allOf(DeoptimizationReason.class), null);
} catch (Throwable t) {
Expand All @@ -163,7 +163,7 @@ public void testUpOverflow() {
// first should deopt with a failed speculation, second not
Map<DeoptimizationReason, Integer> deoptCountsBefore = getDeoptCounts(method);
try {
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, Collections.emptySet(), null);
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, true, Set.of(), null);
deoptCountsBefore = getDeoptCounts(method);
executeActualCheckDeopt(new OptionValues(getInitialOptions(), GraalOptions.LoopPeeling, false, GraalOptions.FullUnroll, false), method, EnumSet.allOf(DeoptimizationReason.class), null);
} catch (Throwable t) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -902,17 +902,25 @@ protected Result executeActual(ResolvedJavaMethod method, Object receiver, Objec
}

protected Result executeActual(OptionValues options, ResolvedJavaMethod method, Object receiver, Object... args) {
return executeActual(options, method, false, receiver, args);
}

protected Result executeActual(OptionValues options, ResolvedJavaMethod method, boolean installAsDefault, Object receiver, Object... args) {
before(method);
Object[] executeArgs = argsWithReceiver(receiver, args);

checkArgs(method, executeArgs);

InstalledCode compiledMethod = getCode(method, options);
InstalledCode compiledMethod = getCode(method, null, false, installAsDefault, options);
try {
return new Result(compiledMethod.executeVarargs(executeArgs), null);
} catch (Throwable e) {
return new Result(null, e);
} finally {
// Prevent a subsequent `executeExpected' call from entering the compiled method
if (installAsDefault) {
compiledMethod.invalidate();
}
after();
}
}
Expand Down Expand Up @@ -1006,9 +1014,13 @@ protected Result test(ResolvedJavaMethod method, Object receiver, Object... args
}

protected Result test(OptionValues options, ResolvedJavaMethod method, Object receiver, Object... args) {
return test(options, method, false, receiver, args);
}

protected final Result test(OptionValues options, ResolvedJavaMethod method, boolean installAsDefault, Object receiver, Object... args) {
Result expect = executeExpected(method, receiver, args);
if (getCodeCache() != null) {
testAgainstExpected(options, method, expect, receiver, args);
testAgainstExpected(options, method, installAsDefault, expect, Set.of(), receiver, args);
}
return expect;
}
Expand All @@ -1031,29 +1043,36 @@ protected Object[] applyArgSuppliers(Object... args) {
}

protected final void testAgainstExpected(ResolvedJavaMethod method, Result expect, Object receiver, Object... args) {
testAgainstExpected(getInitialOptions(), method, expect, Collections.<DeoptimizationReason> emptySet(), receiver, args);
}

protected void testAgainstExpected(ResolvedJavaMethod method, Result expect, Set<DeoptimizationReason> shouldNotDeopt, Object receiver, Object... args) {
testAgainstExpected(getInitialOptions(), method, expect, shouldNotDeopt, receiver, args);
testAgainstExpected(getInitialOptions(), method, false, expect, Set.of(), receiver, args);
}

protected final void testAgainstExpected(OptionValues options, ResolvedJavaMethod method, Result expect, Object receiver, Object... args) {
testAgainstExpected(options, method, expect, Collections.<DeoptimizationReason> emptySet(), receiver, args);
testAgainstExpected(options, method, false, expect, Set.of(), receiver, args);
}

protected void testAgainstExpected(OptionValues options, ResolvedJavaMethod method, Result expect, Set<DeoptimizationReason> shouldNotDeopt, Object receiver, Object... args) {
Result actual = executeActualCheckDeopt(options, method, shouldNotDeopt, receiver, args);
testAgainstExpected(options, method, true, expect, shouldNotDeopt, receiver, args);
}

private void testAgainstExpected(OptionValues options, ResolvedJavaMethod method, boolean installAsDefault, Result expect, Set<DeoptimizationReason> shouldNotDeopt, Object receiver,
Object... args) {
Result actual = executeActualCheckDeopt(options, method, installAsDefault, shouldNotDeopt, receiver, args);
assertEquals(expect, actual);
}

protected Result executeActualCheckDeopt(OptionValues options, ResolvedJavaMethod method, Set<DeoptimizationReason> shouldNotDeopt, Object receiver, Object... args) {
protected final Result executeActualCheckDeopt(OptionValues options, ResolvedJavaMethod method, Set<DeoptimizationReason> shouldNotDeopt, Object receiver,
Object... args) {
return executeActualCheckDeopt(options, method, !shouldNotDeopt.isEmpty(), shouldNotDeopt, receiver, args);
}

protected final Result executeActualCheckDeopt(OptionValues options, ResolvedJavaMethod method, boolean installAsDefault, Set<DeoptimizationReason> shouldNotDeopt, Object receiver,
Object... args) {
Map<DeoptimizationReason, Integer> deoptCounts = new EnumMap<>(DeoptimizationReason.class);
ProfilingInfo profile = method.getProfilingInfo();
for (DeoptimizationReason reason : shouldNotDeopt) {
deoptCounts.put(reason, profile.getDeoptimizationCount(reason));
}
Result actual = executeActual(options, method, receiver, args);
Result actual = executeActual(options, method, installAsDefault, receiver, args);
profile = method.getProfilingInfo(); // profile can change after execution
for (DeoptimizationReason reason : shouldNotDeopt) {
Assert.assertEquals("wrong number of deopt counts for " + reason, (int) deoptCounts.get(reason), profile.getDeoptimizationCount(reason));
Expand Down Expand Up @@ -1186,8 +1205,7 @@ protected InstalledCode getCode(final ResolvedJavaMethod installedCodeOwner, Str
} catch (Throwable e) {
throw debug.handle(e);
}

if (useCache) {
if (useCache && !installAsDefault) {
cache.get().put(installedCodeOwner, Pair.create(options, installedCode));
}
return installedCode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import java.lang.constant.ClassDesc;
import java.lang.constant.MethodTypeDesc;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.junit.Test;
Expand Down Expand Up @@ -78,7 +77,7 @@ public void testSubWordInput() throws ClassNotFoundException {
getCode(getResolvedJavaMethod(testClass, GET), null, false, true, getInitialOptions());
assertEquals(executeExpected(wrapper, null, value), expected);
// test with inlining
testAgainstExpected(wrapper, expected, Collections.emptySet(), null, value);
testAgainstExpected(wrapper, expected, null, new Object[]{value});
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import java.lang.constant.ClassDesc;
import java.lang.constant.MethodTypeDesc;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.junit.Test;
Expand Down Expand Up @@ -76,7 +75,7 @@ public void testSubWordInput() throws ClassNotFoundException {
getCode(getResolvedJavaMethod(testClass, GET), null, false, true, getInitialOptions());
assertEquals(executeExpected(wrapper, null, value), expected);
// test with inlining
testAgainstExpected(wrapper, expected, Collections.emptySet(), null, value);
testAgainstExpected(wrapper, expected, null, new Object[]{value});
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
Expand Down Expand Up @@ -35,22 +35,20 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;

import jdk.graal.compiler.api.directives.GraalDirectives;
import jdk.graal.compiler.core.test.GraalCompilerTest;
import jdk.graal.compiler.jtt.JTTTest;
import jdk.graal.compiler.lir.jtt.LIRTest;
import jdk.graal.compiler.lir.jtt.LIRTestSpecification;
import jdk.graal.compiler.core.common.LIRKind;
import jdk.graal.compiler.hotspot.HotSpotBackend;
import jdk.graal.compiler.hotspot.debug.BenchmarkCounters;
import jdk.graal.compiler.lir.ConstantValue;
import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
import jdk.graal.compiler.lir.jtt.LIRTest;
import jdk.graal.compiler.lir.jtt.LIRTestSpecification;
import jdk.graal.compiler.test.SubprocessUtil;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;

import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.ResolvedJavaMethod;
Expand Down Expand Up @@ -97,7 +95,7 @@ public void incrementCounter() {

Object[] args = new Object[]{Integer.MAX_VALUE * 4L};
ResolvedJavaMethod method = getResolvedJavaMethod("test");
executeActualCheckDeopt(GraalCompilerTest.getInitialOptions(), method, JTTTest.EMPTY, null, args);
executeActual(method, null, args);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void testDeoptimize() {
for (boolean osr : new boolean[]{false}) {
this.reason = r;
this.isOSR = osr;
test("deoptimizeSnippet");
test(getInitialOptions(), getResolvedJavaMethod("deoptimizeSnippet"), true, null, new Object[0]);
ProfilingInfo info = lastCompiledGraph.method().getProfilingInfo(!isOSR, isOSR);
int count = info.getDeoptimizationCount(reason);
Assert.assertEquals(String.format("reason:%s, osr:%s", r, osr), 1, count);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2025, 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.
*
Expand Down Expand Up @@ -102,7 +102,7 @@ private void runOutOfBound(String methodName, int size, boolean loopLimitCheck,
Object[] args = new Object[testParameters.length + 1];
args[0] = array;
System.arraycopy(testParameters, 0, args, 1, testParameters.length);
Result result = executeActual(getOptionsMainPath(), method, null, args);
Result result = executeActual(getOptionsMainPath(), method, true, null, args);
Assert.assertNotNull(result.exception);
Assert.assertTrue(result.exception instanceof ArrayIndexOutOfBoundsException);
profile = method.getProfilingInfo();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collections;
import java.util.Formatter;
import java.util.ListIterator;
import java.util.Optional;
import java.util.Set;

import org.junit.Assert;
import org.junit.AssumptionViolatedException;

import jdk.graal.compiler.api.test.Graal;
import jdk.graal.compiler.core.phases.fuzzing.AbstractCompilationPlan;
import jdk.graal.compiler.core.phases.fuzzing.FullFuzzedCompilationPlan;
Expand All @@ -56,9 +58,6 @@
import jdk.graal.compiler.phases.tiers.MidTierContext;
import jdk.graal.compiler.phases.tiers.Suites;
import jdk.graal.compiler.runtime.RuntimeProvider;
import org.junit.Assert;
import org.junit.AssumptionViolatedException;

import jdk.vm.ci.meta.DeoptimizationReason;
import jdk.vm.ci.meta.ResolvedJavaMethod;

Expand All @@ -80,7 +79,6 @@ public class JTTTest extends GraalCompilerTest {
public static final class DummyTestClass {
}

protected static final Set<DeoptimizationReason> EMPTY = Collections.<DeoptimizationReason> emptySet();
/**
* The arguments which, if non-null, will replace the Locals in the test method's graph.
*/
Expand Down Expand Up @@ -134,7 +132,7 @@ protected void runTest(String name, Object... args) {
}

protected void runTest(OptionValues options, String name, Object... args) {
runTest(options, EMPTY, name, args);
runTest(options, Set.of(), name, args);
}

protected void runTest(Set<DeoptimizationReason> shouldNotDeopt, String name, Object... args) {
Expand Down Expand Up @@ -191,7 +189,7 @@ protected void runTest(OptionValues options, Set<DeoptimizationReason> shouldNot
* to the usual compilation using {@link GraalCompilerTest#testAgainstExpected}.
*/
@Override
protected void testAgainstExpected(OptionValues options, ResolvedJavaMethod method, Result expect, Set<DeoptimizationReason> shouldNotDeopt, Object receiver, Object... args) {
protected final void testAgainstExpected(OptionValues options, ResolvedJavaMethod method, Result expect, Set<DeoptimizationReason> shouldNotDeopt, Object receiver, Object... args) {
if (Boolean.getBoolean(COMPILATION_PLAN_FUZZING_SYSTEM_PROPERTY)) {
testAgainstExpectedWithFuzzedCompilationPlan(options, method, expect, shouldNotDeopt, receiver, args);
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 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
Expand Down Expand Up @@ -55,7 +55,7 @@ public void run0() throws Throwable {
@Test
public void run1() throws Throwable {
// tests that the null check isn't removed along with the read
runTest(EMPTY, "test", (Object) null);
runTest("test", (Object) null);
}

@Test
Expand Down
Loading
Loading