Skip to content

Commit 390039e

Browse files
author
Pavel Marek
committed
[GR-19768] Update Truffle import.
PullRequest: fastr/2699
2 parents 148dae3 + cbff388 commit 390039e

File tree

3 files changed

+83
-37
lines changed

3 files changed

+83
-37
lines changed

‎com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -626,7 +626,7 @@ public static Frame getCallerFrame(RCaller caller, FrameAccess fa) {
626626

627627
/**
628628
* Retrieve the actual current frame. This may be different from the frame returned by
629-
* {@link TruffleRuntime#getCurrentFrame()} due to operations applied in
629+
* {@code TruffleRuntime#getCurrentFrame()} due to operations applied in
630630
* {@code FunctionDefinitionNode.execute(VirtualFrame)}. Also see
631631
* {@code FunctionDefinitionNode.substituteFrame}.
632632
*/

‎graal_common.json‎

Lines changed: 79 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,89 @@
11
{
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
3-
43
"jdks": {
5-
"openjdk8": {"name": "openjdk", "version": "8u302+06-jvmci-22.0-b01", "platformspecific": true },
6-
"oraclejdk8": {"name": "oraclejdk", "version": "8u311+11-jvmci-22.0-b01", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u311+11-jvmci-22.0-b01-fastdebug", "platformspecific": true },
8-
9-
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
10-
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.13+8-jvmci-22.0-b02", "platformspecific": true },
12-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.14+7-jvmci-22.1-b00-sulong", "platformspecific": true },
13-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.14+5-jvmci-22.0-b02", "platformspecific": true },
14-
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.14+6-jvmci-22.1-b00-sulong", "platformspecific": true },
15-
16-
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
17-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.2+5-jvmci-22.0-b02", "platformspecific": true },
18-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.2+5-jvmci-22.0-b02-debug", "platformspecific": true },
19-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.2+6-jvmci-22.1-b00-sulong", "platformspecific": true },
20-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.2+5-jvmci-22.0-b02", "platformspecific": true },
21-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.2+5-jvmci-22.0-b02-debug", "platformspecific": true },
22-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.2+6-jvmci-22.1-b00-sulong", "platformspecific": true }
4+
"openjdk11": {
5+
"name": "openjdk",
6+
"version": "11.0.11+9",
7+
"platformspecific": true
8+
},
9+
"oraclejdk11": {
10+
"name": "oraclejdk",
11+
"version": "11.0.11+9",
12+
"platformspecific": true
13+
},
14+
"labsjdk-ce-11": {
15+
"name": "labsjdk",
16+
"version": "ce-11.0.15+2-jvmci-22.1-b01",
17+
"platformspecific": true
18+
},
19+
"labsjdk-ce-11-llvm": {
20+
"name": "labsjdk",
21+
"version": "ce-11.0.15+2-jvmci-22.1-b01-sulong",
22+
"platformspecific": true
23+
},
24+
"labsjdk-ee-11": {
25+
"name": "labsjdk",
26+
"version": "ee-11.0.14+6-jvmci-22.1-b01",
27+
"platformspecific": true
28+
},
29+
"labsjdk-ee-11-llvm": {
30+
"name": "labsjdk",
31+
"version": "ee-11.0.14+6-jvmci-22.1-b01-sulong",
32+
"platformspecific": true
33+
},
34+
"oraclejdk17": {
35+
"name": "oraclejdk",
36+
"version": "17.0.1+12",
37+
"platformspecific": true
38+
},
39+
"labsjdk-ce-17": {
40+
"name": "labsjdk",
41+
"version": "ce-17.0.3+2-jvmci-22.1-b01",
42+
"platformspecific": true
43+
},
44+
"labsjdk-ce-17Debug": {
45+
"name": "labsjdk",
46+
"version": "ce-17.0.3+2-jvmci-22.1-b01-debug",
47+
"platformspecific": true
48+
},
49+
"labsjdk-ce-17-llvm": {
50+
"name": "labsjdk",
51+
"version": "ce-17.0.3+2-jvmci-22.1-b01-sulong",
52+
"platformspecific": true
53+
},
54+
"labsjdk-ee-17": {
55+
"name": "labsjdk",
56+
"version": "ee-17.0.3+6-jvmci-22.1-b01",
57+
"platformspecific": true
58+
},
59+
"labsjdk-ee-17Debug": {
60+
"name": "labsjdk",
61+
"version": "ee-17.0.3+6-jvmci-22.1-b01-debug",
62+
"platformspecific": true
63+
},
64+
"labsjdk-ee-17-llvm": {
65+
"name": "labsjdk",
66+
"version": "ee-17.0.3+6-jvmci-22.1-b01-sulong",
67+
"platformspecific": true
68+
}
2369
},
24-
25-
"COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
70+
"COMMENT.devkits": "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
2671
"devkits": {
27-
"windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
28-
"windows-openjdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
29-
"windows-jdk11": { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
30-
"windows-jdk17": { "packages" : { "devkit:VS2019-16.9.3+1" : "==0" }}
72+
"windows-jdk11": {
73+
"packages": {
74+
"devkit:VS2017-15.9.24+1": "==0"
75+
}
76+
},
77+
"windows-jdk17": {
78+
"packages": {
79+
"devkit:VS2019-16.9.3+1": "==0"
80+
}
81+
}
3182
},
32-
33-
"catch_files" : [
83+
"catch_files": [
3484
"Graal diagnostic output saved in '(?P<filename>[^']+)'",
3585
"Dumping debug output to '(?P<filename>[^']+)'"
3686
],
37-
3887
"deps": {
3988
"COMMENT.common": [
4089
"pip:isort is a dependency of pip:pylint. The explicit dependency on the pip package works around",
@@ -54,7 +103,6 @@
54103
"pip:ninja_syntax": "==1.7.2"
55104
}
56105
},
57-
58106
"linux": {
59107
"packages": {
60108
"git": ">=1.8.3",
@@ -71,9 +119,7 @@
71119
"LC_ALL": "en_US.UTF-8"
72120
}
73121
},
74-
"windows": {
75-
}
76-
122+
"windows": {}
77123
},
78124
"downloads": {
79125
"eclipse": {
@@ -139,4 +185,4 @@
139185
"darwin": {}
140186
}
141187
}
142-
}
188+
}

‎mx.fastr/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"subdir" : True,
1010
# The version must be the same as the version of Sulong
1111
# TRUFFLE REVISION (note: this is a marker for script that can update this)
12-
"version" : "6ab8d8459b02329873cb1f2930f41805e432f34a",
12+
"version" : "37d08f1c7ca9439056fbda2dc18b5b627dbe24bc",
1313
"urls" : [
1414
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
1515
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -20,7 +20,7 @@
2020
"subdir" : True,
2121
# The version must be the same as the version of Truffle
2222
# TRUFFLE REVISION (note: this is a marker for script that can update this)
23-
"version" : "6ab8d8459b02329873cb1f2930f41805e432f34a",
23+
"version" : "37d08f1c7ca9439056fbda2dc18b5b627dbe24bc",
2424
"urls" : [
2525
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
2626
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},

0 commit comments

Comments
 (0)