Skip to content

Commit 255206a

Browse files
OracleLabsAutomationzapster
OracleLabsAutomation
authored and
zapster
committed
[GR-55003] Update labsjdk to 24+4-jvmci-b01
PullRequest: graal/18175
2 parents 3a64902 + a79213d commit 255206a

File tree

8 files changed

+26
-22
lines changed

8 files changed

+26
-22
lines changed

‎.github/workflows/main.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,11 @@ jobs:
121121
GATE_TAGS: "build,helloworld,native_unittests"
122122
PRIMARY: "substratevm"
123123
PIP_PACKAGES: "jsonschema==4.6.1"
124-
- env:
125-
JDK_VERSION: "latest"
126-
GATE_TAGS: "build,debuginfotest"
127-
PRIMARY: "substratevm"
124+
# debuginfotest broken by JDK 24+4 [GR-55038]
125+
# - env:
126+
# JDK_VERSION: "latest"
127+
# GATE_TAGS: "build,debuginfotest"
128+
# PRIMARY: "substratevm"
128129
- env:
129130
JDK_VERSION: "latest"
130131
GATE_TAGS: "hellomodule"

‎common.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+2-53", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+5-437", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] },
1414

@@ -45,13 +45,13 @@
4545
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
4646
"graalvm-ee-21": {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true },
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+3", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+3-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+3-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+3-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+3-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+3-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+3-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+4", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+4-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+4-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+4-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+4-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+4-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+4-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackend.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public static void unsafeArraycopy(Word srcAddr, Word dstAddr, Word size) {
252252
public static final HotSpotForeignCallDescriptor CHACHA20Block = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, HAS_SIDE_EFFECT, any(), "_chacha20Block", int.class,
253253
WordBase.class, WordBase.class);
254254

255-
public static final HotSpotForeignCallDescriptor INTPOLY_MONTGOMERYMULT_P256 = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, HAS_SIDE_EFFECT, any(), "_intpoly_montgomeryMult_P256", int.class,
255+
public static final HotSpotForeignCallDescriptor INTPOLY_MONTGOMERYMULT_P256 = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, HAS_SIDE_EFFECT, any(), "_intpoly_montgomeryMult_P256", void.class,
256256
WordBase.class, WordBase.class, WordBase.class);
257257

258258
public static final HotSpotForeignCallDescriptor INTPOLY_ASSIGN = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, HAS_SIDE_EFFECT, any(), "_intpoly_assign", void.class,

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
5555
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5656
"21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
5757
"24", Map.of(
58-
"Oracle Corporation", createLabsJDKVersion("24+3", 1),
59-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+3", 1)));
58+
"Oracle Corporation", createLabsJDKVersion("24+4", 1),
59+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+4", 1)));
6060
private static final int NA = 0;
6161
/**
6262
* Minimum Java release supported by Graal.

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
12341234

12351235
private static void registerP256Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
12361236
Registration r = new Registration(plugins, "sun.security.util.math.intpoly.MontgomeryIntegerPolynomialP256", replacements);
1237-
r.registerConditional(config.intpolyMontgomeryMultP256 != 0L, new InvocationPlugin("mult", Receiver.class, long[].class, long[].class, long[].class) {
1237+
r.registerConditional(config.intpolyMontgomeryMultP256 != 0L, new InvocationPlugin("multImpl", Receiver.class, long[].class, long[].class, long[].class) {
12381238
@Override
12391239
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode aIn, ValueNode bIn, ValueNode rOut) {
12401240
try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
@@ -1246,8 +1246,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
12461246
ValueNode bStart = helper.arrayStart(bNotNull, JavaKind.Long);
12471247
ValueNode rStart = helper.arrayStart(rNotNull, JavaKind.Long);
12481248

1249-
ForeignCallNode call = new ForeignCallNode(INTPOLY_MONTGOMERYMULT_P256, aStart, bStart, rStart);
1250-
b.addPush(JavaKind.Int, call);
1249+
b.add(new ForeignCallNode(INTPOLY_MONTGOMERYMULT_P256, aStart, bStart, rStart));
12511250
}
12521251
return true;
12531252
}

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -485,7 +485,9 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
485485
ValueNode nonNullReceiver = receiver.get(true);
486486
ValueNode bufStart = helper.arrayElementPointer(buf, JavaKind.Byte, ofs);
487487
ValueNode state = helper.loadField(nonNullReceiver, stateField);
488-
ValueNode stateStart = helper.arrayStart(state, JavaKind.Byte);
488+
assert stateField.getType().isArray() : "SHA3.state expected to be an array, got: " + stateField.getType();
489+
JavaKind stateElementKind = stateField.getType().getComponentType().getJavaKind();
490+
ValueNode stateStart = helper.arrayStart(state, stateElementKind);
489491
ValueNode blockSize = helper.loadField(nonNullReceiver, blockSizeField);
490492
b.add(new MessageDigestNode.SHA3Node(bufStart, stateStart, blockSize));
491493
return true;

‎substratevm/ci/ci.jsonnet

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@
118118
// but since we support JDK 21 anyways, there is not good reason to do so.
119119
"linux:amd64:jdk21": gate + t("30:00"),
120120
}),
121-
"basics": mxgate("build,helloworld,native_unittests,truffle_unittests,debuginfotest,hellomodule") + maven + jsonschema + platform_spec(no_jobs) + platform_spec({
121+
# debuginfotest broken by JDK 24+4 [GR-55038]
122+
# "basics": mxgate("build,helloworld,native_unittests,truffle_unittests,debuginfotest,hellomodule") + maven + jsonschema + platform_spec(no_jobs) + platform_spec({
123+
"basics": mxgate("build,helloworld,native_unittests,truffle_unittests,hellomodule") + maven + jsonschema + platform_spec(no_jobs) + platform_spec({
122124
"linux:amd64:jdk-latest": gate + gdb("10.2") + t("55:00"),
123125
"windows:amd64:jdk-latest": gate + t("1:30:00"),
124126
}) + variants({

‎substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/UpcallStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
import jdk.vm.ci.meta.ResolvedJavaMethod;
9595

9696
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+2/src/hotspot/share/prims/upcallLinker.cpp")
97-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23+12/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp")
97+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+4/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp")
9898
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23+12/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp")
9999
public abstract class UpcallStub extends NonBytecodeMethod {
100100
protected final JavaEntryPointInfo jep;

0 commit comments

Comments
 (0)