From e5fad3c2aec6ae42dff79c35c7021c900ed60bb8 Mon Sep 17 00:00:00 2001 From: Roland Schatz Date: Tue, 30 Aug 2022 16:36:50 +0200 Subject: [PATCH 1/2] Fix JDK19 serializable field warnings. --- .../truffle/llvm/runtime/NativeContextExtension.java | 3 ++- .../truffle/llvm/runtime/except/LLVMUserException.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/NativeContextExtension.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/NativeContextExtension.java index f9a43f1b59af..fdd6466baec4 100644 --- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/NativeContextExtension.java +++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/NativeContextExtension.java @@ -48,7 +48,8 @@ public static class UnsupportedNativeTypeException extends Exception { private static final long serialVersionUID = 1L; - private final Type type; + // transient to shut up JDK19 warnings (this should never be serialized anyway) + private final transient Type type; public UnsupportedNativeTypeException(Type type) { super("unsupported type " + type + " in native interop"); diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/except/LLVMUserException.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/except/LLVMUserException.java index 423821eed1a4..8a01b1965328 100644 --- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/except/LLVMUserException.java +++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/except/LLVMUserException.java @@ -45,7 +45,8 @@ public class LLVMUserException extends LLVMException { private static final long serialVersionUID = 1L; - final LLVMPointer unwindHeader; // or throw info + // transient to shut up JDK19 warnings (this should never be serialized anyway) + final transient LLVMPointer unwindHeader; // or throw info public LLVMUserException(Node location, LLVMPointer unwindHeader) { super(location); @@ -94,8 +95,8 @@ public static final class LLVMUserExceptionWindows extends LLVMUserException { private static final long serialVersionUID = 1L; - final LLVMPointer imageBase; - final LLVMPointer exceptionObject; + final transient LLVMPointer imageBase; + final transient LLVMPointer exceptionObject; public LLVMUserExceptionWindows(Node location, LLVMPointer imageBase, LLVMPointer exceptionObject, LLVMPointer throwInfo) { super(location, throwInfo); From 49767a061bd9927adbf684128adb9592c86d7a45 Mon Sep 17 00:00:00 2001 From: Roland Schatz Date: Tue, 30 Aug 2022 16:01:14 +0200 Subject: [PATCH 2/2] Add Sulong tests for JDK19. --- sulong/ci.jsonnet | 1 + sulong/ci_common/sulong-common.jsonnet | 41 ++++++++------------------ 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/sulong/ci.jsonnet b/sulong/ci.jsonnet index 73f4caf4ac53..184be0c499b0 100644 --- a/sulong/ci.jsonnet +++ b/sulong/ci.jsonnet @@ -70,6 +70,7 @@ local sc = (import "ci_common/sulong-common.jsonnet"); sc.gate + $.sulong + sc.labsjdk_ce_11 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk11-linux-amd64" }, sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk17-linux-amd64" }, + sc.daily + $.sulong + sc.labsjdk_ce_19 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "daily-sulong-basic-nwcc-llvm-toolchain-jdk19-linux-amd64" }, sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk17-linux-aarch64", timelimit: "30:00" }, diff --git a/sulong/ci_common/sulong-common.jsonnet b/sulong/ci_common/sulong-common.jsonnet index c497d5ddf6a0..961542a946a5 100644 --- a/sulong/ci_common/sulong-common.jsonnet +++ b/sulong/ci_common/sulong-common.jsonnet @@ -1,10 +1,10 @@ # File is formatted with # `jsonnetfmt --indent 2 --max-blank-lines 2 --sort-imports --string-style d --comment-style h -i ci.jsonnet` -{ - local common = import "../../common.jsonnet", - local composable = (import "../../common-utils.libsonnet").composable, - local sulong_deps = composable((import "../../common.json").sulong.deps), +local common = import "../../common.jsonnet"; +local composable = (import "../../common-utils.libsonnet").composable; +local sulong_deps = composable((import "../../common.json").sulong.deps); +{ local linux_amd64 = common.linux_amd64, local linux_aarch64 = common.linux_aarch64, local darwin_amd64 = common.darwin_amd64, @@ -43,30 +43,6 @@ assert self.gen_name == self.name : "Name error. expected '%s', actual '%s'" % [self.gen_name, self.name], } + if std.objectHasAll(b, "description_text") then { description: "%s with %s on %s/%s" % [b.description_text, self.jdk, self.os, self.arch]} else {}, - labsjdk_ce_11: common["labsjdk-ce-11"] { - jdk:: "jdk11", - downloads+: { - # FIXME: do we really need to set EXTRA_JAVA_HOMES to an empty list? - EXTRA_JAVA_HOMES: { pathlist: [] }, - }, - }, - - labsjdk_ce_17: common["labsjdk-ce-17"] { - jdk:: "jdk17", - downloads+: { - # FIXME: do we really need to set EXTRA_JAVA_HOMES to an empty list? - EXTRA_JAVA_HOMES: { pathlist: [] }, - }, - }, - - labsjdk_ee_11: common["labsjdk-ee-11"] { - jdk:: "jdk11", - }, - - labsjdk_ee_17: common["labsjdk-ee-17"] { - jdk:: "jdk17", - }, - linux_amd64:: linux_amd64 + sulong_deps.linux, linux_aarch64:: linux_aarch64 + sulong_deps.linux, darwin_amd64:: darwin_amd64 + sulong_deps.darwin_amd64, @@ -218,4 +194,13 @@ libgmp: "==6.1.2", }, }, + +} + { + + [std.strReplace(name, "-", "_")]: common[name] { + jdk: "jdk" + self.jdk_version, + } + for name in std.objectFieldsAll(common) + if std.startsWith(name, "labsjdk-") + }