Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GR-40737] [GR-36296] Add Sulong tests for JDK19. #4891

Merged
merged 2 commits into from
Sep 9, 2022
Merged

[GR-40737] [GR-36296] Add Sulong tests for JDK19. #4891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5fad3c
Fix JDK19 serializable field warnings.
rschatz Aug 30, 2022
49767a0
Add Sulong tests for JDK19.
rschatz Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sulong/ci.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },

Expand Down
41 changes: 13 additions & 28 deletions sulong/ci_common/sulong-common.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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-")

}
3 changes: 2 additions & 1 deletion ...acle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/NativeContextExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
7 changes: 4 additions & 3 deletions ...le.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/except/LLVMUserException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down