Skip to content

Commit 6b34ef3

Browse files
brahimhaddoubrahimhaddou
committed
[GR-46865] Update to jvmci-22.3-b22.
PullRequest: graal/14972
2 parents 3f54da1 + 7d491d5 commit 6b34ef3

File tree

13 files changed

+61
-18
lines changed

13 files changed

+61
-18
lines changed

‎common.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
"jdks": {
55
"openjdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "open": true, "release": true, "platformspecific": true },
6-
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
7-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.19+7-jvmci-22.3-b18", "platformspecific": true },
8-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.19+7-jvmci-22.3-b18-sulong", "platformspecific": true },
6+
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.20", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
7+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.20+8-jvmci-22.3-b22", "platformspecific": true },
8+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.20+8-jvmci-22.3-b22-sulong", "platformspecific": true },
99
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.20+9-jvmci-22.3-b21", "platformspecific": true },
1010
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.20+9-jvmci-22.3-b21-sulong", "platformspecific": true },
1111

1212
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.1", "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
13-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+7-jvmci-22.3-b18", "platformspecific": true },
14-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.7+7-jvmci-22.3-b18-debug", "platformspecific": true },
15-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.7+7-jvmci-22.3-b18-sulong", "platformspecific": true },
13+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.8+7-jvmci-22.3-b22", "platformspecific": true },
14+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.8+7-jvmci-22.3-b22-debug", "platformspecific": true },
15+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.8+7-jvmci-22.3-b22-sulong", "platformspecific": true },
1616
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.8+9-jvmci-22.3-b21", "platformspecific": true },
1717
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.8+9-jvmci-22.3-b21-debug", "platformspecific": true },
1818
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.8+9-jvmci-22.3-b21-sulong", "platformspecific": true },

‎compiler/mx.compiler/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
"groupId" : "org.graalvm.compiler",
77
"version" : "22.3.3",
8-
"release" : True,
8+
"release" : False,
99
"url" : "http://www.graalvm.org/",
1010
"developer" : {
1111
"name" : "GraalVM Development",

‎compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public UnimplementedGraalIntrinsics(GraalHotSpotVMConfig config, Architecture ar
9595
add(ignore,
9696
"java/lang/Math.atan2(DD)D",
9797
"jdk/internal/misc/Unsafe.park(ZJ)V",
98+
"jdk/internal/misc/Unsafe.storeStoreFence()V",
9899
"jdk/internal/misc/Unsafe.unpark(Ljava/lang/Object;)V",
99100
"sun/misc/Unsafe.park(ZJ)V",
100101
"sun/misc/Unsafe.prefetchRead(Ljava/lang/Object;J)V",

‎compiler/src/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JavaVersionUtil.java

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
package org.graalvm.compiler.serviceprovider;
2626

2727
import java.lang.Runtime.Version;
28+
import jdk.vm.ci.services.Services;
2829

2930
/**
3031
* Interface to query which JDK version Graal is running on.
@@ -36,6 +37,11 @@ public final class JavaVersionUtil {
3637
*/
3738
public static final int JAVA_SPEC = Runtime.version().feature();
3839

40+
/**
41+
* Return the value of JVM specification vendor.
42+
*/
43+
public static final String JVM_VENDOR = Services.getSavedProperties().get("java.vendor.version");
44+
3945
private JavaVersionUtil() {
4046
}
4147
}

‎espresso/mx.espresso/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"mxversion": "6.9.1",
2525
"name": "espresso",
2626
"version" : "22.3.3",
27-
"release" : True,
27+
"release" : False,
2828
"groupId" : "org.graalvm.espresso",
2929
"url" : "https://www.graalvm.org/reference-manual/java-on-truffle/",
3030
"developer" : {

‎regex/mx.regex/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"name" : "regex",
4545

4646
"version" : "22.3.3",
47-
"release" : True,
47+
"release" : False,
4848
"groupId" : "org.graalvm.regex",
4949
"url" : "http://www.graalvm.org/",
5050
"developer" : {

‎sdk/mx.sdk/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"mxversion" : "6.7.0",
4343
"name" : "sdk",
4444
"version" : "22.3.3",
45-
"release" : True,
45+
"release" : False,
4646
"sourceinprojectwhitelist" : [],
4747
"url" : "https://github.com/oracle/graal",
4848
"groupId" : "org.graalvm.sdk",

‎substratevm/mx.substratevm/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"mxversion" : "6.5.5",
44
"name": "substratevm",
55
"version" : "22.3.3",
6-
"release" : True,
6+
"release" : False,
77
"url" : "https://github.com/oracle/graal/tree/master/substratevm",
88

99
"groupId" : "org.graalvm.nativeimage",

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11EE.java

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
package com.oracle.svm.core.jdk;
26+
27+
import java.util.function.BooleanSupplier;
28+
29+
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
30+
31+
public class JDK11EE implements BooleanSupplier {
32+
@Override
33+
public boolean getAsBoolean() {
34+
return JavaVersionUtil.JAVA_SPEC == 11 && JavaVersionUtil.JVM_VENDOR.contains("Oracle");
35+
}
36+
}

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ final class Target_javax_crypto_JceSecurity {
324324
*
325325
* This is only used in {@link KeyAgreement}, it's safe to remove.
326326
*/
327-
@Alias @TargetElement(onlyWith = JDK11OrEarlier.class) //
327+
@Alias @TargetElement(onlyWith = JDK11EE.class) //
328328
@InjectAccessors(JceSecurityAccessor.class) //
329329
static SecureRandom RANDOM;
330330

‎tools/mx.tools/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
"groupId" : "org.graalvm.tools",
2929
"version" : "22.3.3",
30-
"release" : True,
30+
"release" : False,
3131
"url" : "http://openjdk.java.net/projects/graal",
3232
"developer" : {
3333
"name" : "GraalVM Development",

‎truffle/mx.truffle/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"mxversion" : "6.5.5",
4343
"name" : "truffle",
4444
"version" : "22.3.3",
45-
"release" : True,
45+
"release" : False,
4646
"groupId" : "org.graalvm.truffle",
4747
"sourceinprojectwhitelist" : [],
4848
"url" : "http://openjdk.java.net/projects/graal",

‎vm/mx.vm/suite.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vm",
33
"version" : "22.3.3",
44
"mxversion" : "6.5.5",
5-
"release" : True,
5+
"release" : False,
66
"groupId" : "org.graalvm",
77

88
"url" : "http://www.graalvm.org/",
@@ -39,7 +39,7 @@
3939
"name": "graal-nodejs",
4040
"subdir": True,
4141
"dynamic": True,
42-
"version": "0135a41c557bc1519d12028f22b819c27110e52c",
42+
"version": "68d63badde5187bd4175afda80f33c6cf69592fc",
4343
"urls" : [
4444
{"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
4545
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
4949
"name": "graal-js",
5050
"subdir": True,
5151
"dynamic": True,
52-
"version": "0135a41c557bc1519d12028f22b819c27110e52c",
52+
"version": "68d63badde5187bd4175afda80f33c6cf69592fc",
5353
"urls": [
5454
{"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
5555
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -75,7 +75,7 @@
7575
},
7676
{
7777
"name": "graalpython",
78-
"version": "8e28dbd122eb5b1d531d1d2942cb4098cefb9ed8",
78+
"version": "5fb3655fbef24e6f0e3ea71f2d4c826caa25d6e7",
7979
"dynamic": True,
8080
"urls": [
8181
{"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

0 commit comments

Comments
 (0)