Skip to content

Commit 5c19866

Browse files
authored
Merge pull request #550 from zakkak/2023-07-25-23.0-sync
[23.0] Synchronization with upstream 23.0 branch for July CPU release 2nd version
2 parents 0f39b5e + 1a99266 commit 5c19866

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

common.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.1", "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
14-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+7-jvmci-23.0-b12", "platformspecific": true },
15-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.7+7-jvmci-23.0-b12-debug", "platformspecific": true },
16-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.7+7-jvmci-23.0-b12-sulong", "platformspecific": true },
14+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.8+7-jvmci-23.0-b15", "platformspecific": true },
15+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.8+7-jvmci-23.0-b15-debug", "platformspecific": true },
16+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.8+7-jvmci-23.0-b15-sulong", "platformspecific": true },
1717
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.8+9-jvmci-23.0-b14", "platformspecific": true },
1818
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.8+9-jvmci-23.0-b14-debug", "platformspecific": true },
1919
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.8+9-jvmci-23.0-b14-sulong", "platformspecific": true },
@@ -27,9 +27,9 @@
2727
"labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05-sulong", "platformspecific": true },
2828

2929
"oraclejdk20": {"name": "jpg-jdk", "version": "20", "build_id": "24", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
30-
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20.0.1+9-jvmci-23.0-b12", "platformspecific": true },
31-
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20.0.1+9-jvmci-23.0-b12-debug", "platformspecific": true },
32-
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20.0.1+9-jvmci-23.0-b12-sulong", "platformspecific": true },
30+
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20.0.2+9-jvmci-23.0-b15", "platformspecific": true },
31+
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20.0.2+9-jvmci-23.0-b15-debug", "platformspecific": true },
32+
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20.0.2+9-jvmci-23.0-b15-sulong", "platformspecific": true },
3333
"labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.2+9-jvmci-23.0-b14", "platformspecific": true },
3434
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.2+9-jvmci-23.0-b14-debug", "platformspecific": true },
3535
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+9-jvmci-23.0-b14-sulong", "platformspecific": true }

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ public UnimplementedGraalIntrinsics(GraalHotSpotVMConfig config, Architecture ar
245245
if (!AESNode.isSupported(arch)) {
246246
add(ignore,
247247
"com/sun/crypto/provider/AESCrypt.implDecryptBlock([BI[BI)V",
248-
"com/sun/crypto/provider/AESCrypt.implEncryptBlock([BI[BI)V");
248+
"com/sun/crypto/provider/AESCrypt.implEncryptBlock([BI[BI)V",
249+
"com/sun/crypto/provider/CounterMode.implCrypt([BII[BI)I");
249250
}
250251

251252
if (!CounterModeAESNode.isSupported(arch)) {
@@ -398,6 +399,8 @@ public UnimplementedGraalIntrinsics(GraalHotSpotVMConfig config, Architecture ar
398399
"jdk/internal/vm/vector/VectorSupport.unaryOp(ILjava/lang/Class;Ljava/lang/Class;ILjava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;"
399400
// @formatter:on
400401
);
402+
add(ignore,
403+
"jdk/internal/misc/Unsafe.storeStoreFence()V");
401404
}
402405

403406
if (arch instanceof AArch64) {

vm/mx.vm/suite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"name": "graal-nodejs",
4040
"subdir": True,
4141
"dynamic": True,
42-
"version": "dde9b765ecb27e54cb473ca25fe5c327cfe85e33",
42+
"version": "b8af554c627475fb02bf2d7820239d5e9b488bcb",
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": "dde9b765ecb27e54cb473ca25fe5c327cfe85e33",
52+
"version": "b8af554c627475fb02bf2d7820239d5e9b488bcb",
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": "875408b2502b40af0c53d90086efe7ad85446e16",
78+
"version": "29994f24d0c3cca0795b605adcfba8571510da15",
7979
"dynamic": True,
8080
"urls": [
8181
{"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

0 commit comments

Comments
 (0)