[GR-46278] Update to jvmci-23.0-b15.

PullRequest: graal/15011
graalvm · Jul 20, 2023 · e1b71d5 · e1b71d5
2 parents 983647a + d870145
commit e1b71d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 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) {