From 6b2dcaa797bc6a156dcb9db70b00c5c41c49cb76 Mon Sep 17 00:00:00 2001 From: Andrej Pecimuth Date: Mon, 4 Aug 2025 09:50:52 +0200 Subject: [PATCH 1/2] Adapt JDK-8364588: Export the NPE backtracking functionality to general null-checking APIs --- .../src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java index 97035fae2af9..0917fc92998a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java @@ -611,8 +611,8 @@ Target_java_lang_Throwable fillInStackTrace() { } @Substitute - @SuppressWarnings("static-method") - private String getExtendedNPEMessage() { + @SuppressWarnings({"static-method", "unused"}) + private String getExtendedNPEMessage(int stackOffset, int searchSlot) { return null; } } From a781285a9727e1488e4d7616f76825e012587a72 Mon Sep 17 00:00:00 2001 From: Andrej Pecimuth Date: Mon, 4 Aug 2025 09:51:16 +0200 Subject: [PATCH 2/2] Update galahad jdk. --- common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.json b/common.json index fea05a770214..38caf8019930 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": "26", "build_id": "jdk-26+9-846", "platformspecific": true, "extrabundles": ["static-libs"]}, + "galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+9-XXX", "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 },