Skip to content

Commit 743b647

Browse files
committed
[GR-40737] [GR-36296] Add Sulong tests for JDK19.
PullRequest: graal/12554
2 parents bc68268 + 49767a0 commit 743b647

File tree

4 files changed

+20
-32
lines changed

4 files changed

+20
-32
lines changed

sulong/ci.jsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
7070

7171
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" },
7272
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" },
73+
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" },
7374

7475
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" },
7576

sulong/ci_common/sulong-common.jsonnet

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# File is formatted with
22
# `jsonnetfmt --indent 2 --max-blank-lines 2 --sort-imports --string-style d --comment-style h -i ci.jsonnet`
3-
{
4-
local common = import "../../common.jsonnet",
5-
local composable = (import "../../common-utils.libsonnet").composable,
6-
local sulong_deps = composable((import "../../common.json").sulong.deps),
3+
local common = import "../../common.jsonnet";
4+
local composable = (import "../../common-utils.libsonnet").composable;
5+
local sulong_deps = composable((import "../../common.json").sulong.deps);
76

7+
{
88
local linux_amd64 = common.linux_amd64,
99
local linux_aarch64 = common.linux_aarch64,
1010
local darwin_amd64 = common.darwin_amd64,
@@ -43,30 +43,6 @@
4343
assert self.gen_name == self.name : "Name error. expected '%s', actual '%s'" % [self.gen_name, self.name],
4444
} + if std.objectHasAll(b, "description_text") then { description: "%s with %s on %s/%s" % [b.description_text, self.jdk, self.os, self.arch]} else {},
4545

46-
labsjdk_ce_11: common["labsjdk-ce-11"] {
47-
jdk:: "jdk11",
48-
downloads+: {
49-
# FIXME: do we really need to set EXTRA_JAVA_HOMES to an empty list?
50-
EXTRA_JAVA_HOMES: { pathlist: [] },
51-
},
52-
},
53-
54-
labsjdk_ce_17: common["labsjdk-ce-17"] {
55-
jdk:: "jdk17",
56-
downloads+: {
57-
# FIXME: do we really need to set EXTRA_JAVA_HOMES to an empty list?
58-
EXTRA_JAVA_HOMES: { pathlist: [] },
59-
},
60-
},
61-
62-
labsjdk_ee_11: common["labsjdk-ee-11"] {
63-
jdk:: "jdk11",
64-
},
65-
66-
labsjdk_ee_17: common["labsjdk-ee-17"] {
67-
jdk:: "jdk17",
68-
},
69-
7046
linux_amd64:: linux_amd64 + sulong_deps.linux,
7147
linux_aarch64:: linux_aarch64 + sulong_deps.linux,
7248
darwin_amd64:: darwin_amd64 + sulong_deps.darwin_amd64,
@@ -218,4 +194,13 @@
218194
libgmp: "==6.1.2",
219195
},
220196
},
197+
198+
} + {
199+
200+
[std.strReplace(name, "-", "_")]: common[name] {
201+
jdk: "jdk" + self.jdk_version,
202+
}
203+
for name in std.objectFieldsAll(common)
204+
if std.startsWith(name, "labsjdk-")
205+
221206
}

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/NativeContextExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public static class UnsupportedNativeTypeException extends Exception {
4848

4949
private static final long serialVersionUID = 1L;
5050

51-
private final Type type;
51+
// transient to shut up JDK19 warnings (this should never be serialized anyway)
52+
private final transient Type type;
5253

5354
public UnsupportedNativeTypeException(Type type) {
5455
super("unsupported type " + type + " in native interop");

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/except/LLVMUserException.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ public class LLVMUserException extends LLVMException {
4545

4646
private static final long serialVersionUID = 1L;
4747

48-
final LLVMPointer unwindHeader; // or throw info
48+
// transient to shut up JDK19 warnings (this should never be serialized anyway)
49+
final transient LLVMPointer unwindHeader; // or throw info
4950

5051
public LLVMUserException(Node location, LLVMPointer unwindHeader) {
5152
super(location);
@@ -94,8 +95,8 @@ public static final class LLVMUserExceptionWindows extends LLVMUserException {
9495

9596
private static final long serialVersionUID = 1L;
9697

97-
final LLVMPointer imageBase;
98-
final LLVMPointer exceptionObject;
98+
final transient LLVMPointer imageBase;
99+
final transient LLVMPointer exceptionObject;
99100

100101
public LLVMUserExceptionWindows(Node location, LLVMPointer imageBase, LLVMPointer exceptionObject, LLVMPointer throwInfo) {
101102
super(location, throwInfo);

0 commit comments

Comments
 (0)