Merge vm-23.0.1 upstream tag into mandrel/23.0

graalvm · Jul 25, 2023 · 0da2199 · 0da2199
2 parents 0f39b5e + 0d67c73
commit 0da2199
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/common.json b/common.json
@@ -11,9 +11,9 @@
     "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.1",  "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+7-jvmci-23.0-b12", "platformspecific": true },
-    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.7+7-jvmci-23.0-b12-debug", "platformspecific": true },
-    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.7+7-jvmci-23.0-b12-sulong", "platformspecific": true },
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.8+7-jvmci-23.0-b15", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.8+7-jvmci-23.0-b15-debug", "platformspecific": true },
+    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.8+7-jvmci-23.0-b15-sulong", "platformspecific": true },
     "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.8+9-jvmci-23.0-b14", "platformspecific": true },
     "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.8+9-jvmci-23.0-b14-debug", "platformspecific": true },
     "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.8+9-jvmci-23.0-b14-sulong", "platformspecific": true },
@@ -27,9 +27,9 @@
     "labsjdk-ee-19-llvm": {"name": "labsjdk",   "version": "ee-19.0.2+7-jvmci-23.0-b05-sulong", "platformspecific": true },
 
     "oraclejdk20":        {"name": "jpg-jdk",   "version": "20",      "build_id": "24", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-20":      {"name": "labsjdk",   "version": "ce-20.0.1+9-jvmci-23.0-b12", "platformspecific": true },
-    "labsjdk-ce-20Debug": {"name": "labsjdk",   "version": "ce-20.0.1+9-jvmci-23.0-b12-debug", "platformspecific": true },
-    "labsjdk-ce-20-llvm": {"name": "labsjdk",   "version": "ce-20.0.1+9-jvmci-23.0-b12-sulong", "platformspecific": true },
+    "labsjdk-ce-20":      {"name": "labsjdk",   "version": "ce-20.0.2+9-jvmci-23.0-b15", "platformspecific": true },
+    "labsjdk-ce-20Debug": {"name": "labsjdk",   "version": "ce-20.0.2+9-jvmci-23.0-b15-debug", "platformspecific": true },
+    "labsjdk-ce-20-llvm": {"name": "labsjdk",   "version": "ce-20.0.2+9-jvmci-23.0-b15-sulong", "platformspecific": true },
     "labsjdk-ee-20":      {"name": "labsjdk",   "version": "ee-20.0.2+9-jvmci-23.0-b14", "platformspecific": true },
     "labsjdk-ee-20Debug": {"name": "labsjdk",   "version": "ee-20.0.2+9-jvmci-23.0-b14-debug", "platformspecific": true },
     "labsjdk-ee-20-llvm": {"name": "labsjdk",   "version": "ee-20.0.2+9-jvmci-23.0-b14-sulong", "platformspecific": true }

diff --git a/....compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java b/....compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java
@@ -245,7 +245,8 @@ public UnimplementedGraalIntrinsics(GraalHotSpotVMConfig config, Architecture ar
         if (!AESNode.isSupported(arch)) {
             add(ignore,
                             "com/sun/crypto/provider/AESCrypt.implDecryptBlock([BI[BI)V",
-                            "com/sun/crypto/provider/AESCrypt.implEncryptBlock([BI[BI)V");
+                            "com/sun/crypto/provider/AESCrypt.implEncryptBlock([BI[BI)V",
+                            "com/sun/crypto/provider/CounterMode.implCrypt([BII[BI)I");
         }
 
         if (!CounterModeAESNode.isSupported(arch)) {
@@ -398,6 +399,8 @@ public UnimplementedGraalIntrinsics(GraalHotSpotVMConfig config, Architecture ar
                             "jdk/internal/vm/vector/VectorSupport.unaryOp(ILjava/lang/Class;Ljava/lang/Class;ILjava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;"
                             // @formatter:on
             );
+            add(ignore,
+                            "jdk/internal/misc/Unsafe.storeStoreFence()V");
         }
 
         if (arch instanceof AArch64) {

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -2,7 +2,7 @@
     "name": "vm",
     "version" : "23.0.1.2",
     "mxversion": "6.17.0",
-    "release" : False,
+    "release" : True,
     "groupId" : "org.graalvm",
 
     "url" : "http://www.graalvm.org/",
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "dde9b765ecb27e54cb473ca25fe5c327cfe85e33",
+                "version": "b8af554c627475fb02bf2d7820239d5e9b488bcb",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "dde9b765ecb27e54cb473ca25fe5c327cfe85e33",
+                "version": "b8af554c627475fb02bf2d7820239d5e9b488bcb",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -75,7 +75,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "875408b2502b40af0c53d90086efe7ad85446e16",
+                "version": "29994f24d0c3cca0795b605adcfba8571510da15",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},