From 63b39a85634b6e3ac632cb4a86e32fb2e06a25e7 Mon Sep 17 00:00:00 2001 From: Yudi Zheng Date: Tue, 10 Jun 2025 11:11:14 +0200 Subject: [PATCH 1/3] Adapt JDK-8359064: Expose reason for marking nmethod non-entrant to JVMCI client --- .../com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java index f7978a85662d..ee01722b79f2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java @@ -46,7 +46,7 @@ public SharedCodeCacheProvider(TargetDescription target, RegisterConfig register } @Override - public void invalidateInstalledCode(InstalledCode installedCode) { + public void invalidateInstalledCode(InstalledCode installedCode, int changeReason) { throw intentionallyUnimplemented(); // ExcludeFromJacocoGeneratedReport } From bc4ae51f977942aa02ca2baa334877804d270a84 Mon Sep 17 00:00:00 2001 From: Yudi Zheng Date: Tue, 10 Jun 2025 11:11:27 +0200 Subject: [PATCH 2/3] Update galahad JDK --- common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.json b/common.json index 812950a1d68b..644b3371c768 100644 --- a/common.json +++ b/common.json @@ -8,7 +8,7 @@ "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { - "galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+2-45", "platformspecific": true, "extrabundles": ["static-libs"]}, + "galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+2-XX", "platformspecific": true, "extrabundles": ["static-libs"]}, "oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]}, "labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true }, From 889e8f2658525a6931058d25726c3006f8159310 Mon Sep 17 00:00:00 2001 From: Yudi Zheng Date: Tue, 17 Jun 2025 13:08:52 +0200 Subject: [PATCH 3/3] revert --- .../com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java index ee01722b79f2..f7978a85662d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SharedCodeCacheProvider.java @@ -46,7 +46,7 @@ public SharedCodeCacheProvider(TargetDescription target, RegisterConfig register } @Override - public void invalidateInstalledCode(InstalledCode installedCode, int changeReason) { + public void invalidateInstalledCode(InstalledCode installedCode) { throw intentionallyUnimplemented(); // ExcludeFromJacocoGeneratedReport }