Skip to content

Commit d28f52a

Browse files
eregoneregon
committed
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/3633
2 parents 9cb5d31 + 602ff17 commit d28f52a

File tree

9 files changed

+37
-39
lines changed

9 files changed

+37
-39
lines changed

‎ci.jsonnet

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,8 @@ local part_definitions = {
239239

240240
v20: with_path {
241241
downloads+: {
242-
JAVA_HOME: common.jdks["labsjdk-ce-20"],
242+
# labsjdk-ee-20, to workaround GR-44177 / https://bugs.openjdk.org/browse/JDK-8302160
243+
JAVA_HOME: { name: "labsjdk", version: "ee-20.0.1+2-jvmci-23.0-b06", platformspecific: true },
243244
},
244245
environment+: {
245246
JT_JDK: "20",
@@ -248,27 +249,27 @@ local part_definitions = {
248249
},
249250

250251
platform: {
251-
local linux_amd64_deps = common.sulong.deps.linux + {
252+
local linux_amd64_deps = common.sulong.deps.common + {
252253
packages+: {
253254
git: ">=1.8.3",
254255
binutils: ">=2.30",
255256
ruby: "==" + mri_version,
256257
},
257258
},
258259

259-
local linux_aarch64_deps = common.sulong.deps.linux + {
260+
local linux_aarch64_deps = common.sulong.deps.common + {
260261
packages+: {
261262
ruby: "==3.0.2",
262263
},
263264
},
264265

265-
local darwin_amd64_deps = common.sulong.deps.darwin_amd64 + {
266+
local darwin_amd64_deps = common.sulong.deps.common + {
266267
packages+: {
267268
ruby: "==3.0.2",
268269
},
269270
},
270271

271-
local darwin_aarch64_deps = common.sulong.deps.darwin_aarch64 + {
272+
local darwin_aarch64_deps = common.sulong.deps.common + {
272273
packages+: {
273274
ruby: "==3.0.2",
274275
},

‎common.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

4-
"mx_version" : "6.14.13",
4+
"mx_version" : "6.15.0",
55

66
"jdks": {
77
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
@@ -19,9 +19,12 @@
1919
"labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05-sulong", "platformspecific": true },
2020

2121
"oraclejdk20": {"name": "jpg-jdk", "version": "20", "build_id": "24", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
22-
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+26-jvmci-23.0-b05", "platformspecific": true },
23-
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+26-jvmci-23.0-b05-debug", "platformspecific": true },
24-
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+26-jvmci-23.0-b05-sulong", "platformspecific": true }
22+
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+30-jvmci-23.0-b06", "platformspecific": true },
23+
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+30-jvmci-23.0-b06-debug", "platformspecific": true },
24+
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+30-jvmci-23.0-b06-sulong", "platformspecific": true },
25+
"labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.1+2-jvmci-23.0-b06", "platformspecific": true },
26+
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.1+2-jvmci-23.0-b06-debug", "platformspecific": true },
27+
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.1+2-jvmci-23.0-b06-sulong", "platformspecific": true }
2528
},
2629

2730
"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)",
@@ -36,7 +39,8 @@
3639

3740
"catch_files" : [
3841
"Graal diagnostic output saved in '(?P<filename>[^']+)'",
39-
"Dumping debug output to '(?P<filename>[^']+)'"
42+
"Dumping debug output to '(?P<filename>[^']+)'",
43+
" (?P<filename>.+/svm_err_b_\\d+T\\d+\\.\\d+_pid\\d+\\.md)"
4044
],
4145

4246
"deps": {
@@ -104,26 +108,23 @@
104108
},
105109
"sulong": {
106110
"deps": {
107-
"common": {},
108-
"linux": {
111+
"common": {
109112
"packages": {
110-
"cmake": "==3.15.2"
113+
"cmake": "==3.22.2"
111114
}
112115
},
116+
"linux": {
117+
"packages": {}
118+
},
113119
"darwin_amd64": {
114-
"packages": {
115-
"cmake": "==3.15.2"
116-
}
120+
"packages": {}
117121
},
118122
"darwin_aarch64": {
119-
"packages": {
120-
"cmake": "==3.22.2"
121-
}
123+
"packages": {}
122124
},
123125
"windows": {
124126
"packages": {
125-
"msvc_source": "==14.0",
126-
"pip:cmake": "==3.18.4"
127+
"msvc_source": "==14.0"
127128
}
128129
}
129130
}
@@ -145,7 +146,7 @@
145146
"linux": {
146147
"packages": {
147148
"00:devtoolset": "==7",
148-
"cmake": "==3.15.2"
149+
"cmake": "==3.22.2"
149150
}
150151
},
151152
"darwin": {}

‎mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"name": "regex",
99
"subdir": True,
10-
"version": "5e6a0afe1e3b54370bd45cee9d129f256d3b002a",
10+
"version": "e5310bf91d65cf8871f6adb90656f671cfb27372",
1111
"urls": [
1212
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1313
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
1616
{
1717
"name": "sulong",
1818
"subdir": True,
19-
"version": "5e6a0afe1e3b54370bd45cee9d129f256d3b002a",
19+
"version": "e5310bf91d65cf8871f6adb90656f671cfb27372",
2020
"urls": [
2121
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2222
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

‎src/main/java/org/truffleruby/core/hash/library/PackedHashStoreLibrary.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,8 @@ public abstract static class LookupPackedEntryNode extends RubyBaseNode {
406406
protected Object getConstantIndexPackedArray(
407407
RubyHash hash, Object key, int hashed, PEBiFunction defaultValueNode,
408408
@Cached ReferenceEqualNode refEqual,
409-
@Cached(value = "isCompareByIdentity(hash)", neverDefault = false) boolean cachedByIdentity,
410-
@Cached(value = "index(refEqual, hash, key, hashed, cachedByIdentity)",
411-
neverDefault = false) int cachedIndex) {
409+
@Cached("isCompareByIdentity(hash)") boolean cachedByIdentity,
410+
@Cached("index(refEqual, hash, key, hashed, cachedByIdentity)") int cachedIndex) {
412411

413412
final Object[] store = (Object[]) hash.store;
414413
return getValue(store, cachedIndex);

‎src/main/java/org/truffleruby/core/kernel/TruffleKernelNodes.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ public static GetSpecialVariableStorage create() {
222222

223223
@Specialization(guards = "frame.getFrameDescriptor() == descriptor", limit = "1")
224224
protected SpecialVariableStorage getFromKnownFrameDescriptor(Frame frame,
225-
@Cached(value = "frame.getFrameDescriptor()", neverDefault = true) FrameDescriptor descriptor,
226-
@Cached(value = "declarationDepth(frame)", neverDefault = false) int declarationFrameDepth) {
225+
@Cached("frame.getFrameDescriptor()") FrameDescriptor descriptor,
226+
@Cached("declarationDepth(frame)") int declarationFrameDepth) {
227227
Object variables;
228228
if (declarationFrameDepth == 0) {
229229
variables = SpecialVariableStorage.get(frame);
@@ -347,8 +347,8 @@ public abstract static class ShareSpecialVariableStorage extends PrimitiveArrayA
347347

348348
@Specialization(guards = "frame.getFrameDescriptor() == descriptor", limit = "1")
349349
protected Object shareSpecialVariable(VirtualFrame frame, SpecialVariableStorage storage,
350-
@Cached(value = "frame.getFrameDescriptor()", neverDefault = true) FrameDescriptor descriptor,
351-
@Cached(value = "declarationDepth(frame)", neverDefault = false) int declarationFrameDepth) {
350+
@Cached("frame.getFrameDescriptor()") FrameDescriptor descriptor,
351+
@Cached("declarationDepth(frame)") int declarationFrameDepth) {
352352
final Frame storageFrame = RubyArguments.getDeclarationFrame(frame, declarationFrameDepth);
353353
SpecialVariableStorage.set(storageFrame, storage);
354354
return nil;

‎src/main/java/org/truffleruby/language/arguments/ProfileArgumentNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ public abstract class ProfileArgumentNode extends RubyContextSourceNode {
3636

3737
@Specialization(guards = "value == cachedValue", limit = "1")
3838
protected boolean cacheBoolean(boolean value,
39-
@Cached(value = "value", neverDefault = false) boolean cachedValue) {
39+
@Cached("value") boolean cachedValue) {
4040
return cachedValue;
4141
}
4242

4343
@Specialization(guards = "value == cachedValue", limit = "1")
4444
protected int cacheInt(int value,
45-
@Cached(value = "value", neverDefault = false) int cachedValue) {
45+
@Cached("value") int cachedValue) {
4646
return cachedValue;
4747
}
4848

‎src/main/java/org/truffleruby/language/globals/WriteSimpleGlobalVariableNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public WriteSimpleGlobalVariableNode(String name) {
4343
"getLanguage().getGlobalVariableNeverAliasedAssumption(index)" },
4444
limit = "1")
4545
protected Object writeTryToKeepConstant(Object value,
46-
@Cached(value = "getLanguage().getGlobalVariableIndex(name)", neverDefault = false) int index,
46+
@Cached("getLanguage().getGlobalVariableIndex(name)") int index,
4747
@Cached("getContext().getGlobalVariableStorage(index)") GlobalVariableStorage storage,
4848
@Cached("storage.getValue()") Object previousValue) {
4949
// NOTE: we still do the volatile write to get the proper memory barrier,

‎src/main/java/org/truffleruby/language/methods/CallForeignMethodNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ public abstract static class ForeignInvokeNode extends RubyBaseNode {
7474
guards = { "name == cachedName", "!isOperatorMethod(cachedName)", "!isAssignmentMethod(cachedName)" },
7575
limit = "1")
7676
protected Object invokeOrRead(Object receiver, String name, Object[] args,
77-
@Cached(value = "name", neverDefault = true) String cachedName,
77+
@Cached("name") String cachedName,
7878
@Cached InvokeOrReadMemberNode invokeOrReadMemberNode) {
7979
return invokeOrReadMemberNode.execute(receiver, name, args);
8080
}
8181

8282
@Specialization(guards = { "name == cachedName", "isOperatorMethod(cachedName)" }, limit = "1")
8383
protected Object operatorMethod(Object receiver, String name, Object[] args,
84-
@Cached(value = "name", neverDefault = true) String cachedName,
84+
@Cached("name") String cachedName,
8585
@Cached ConvertForOperatorAndReDispatchNode operatorNode) {
8686
return operatorNode.execute(receiver, name, args);
8787
}

‎tool/jt.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,6 @@ def ee_jdk?
178178
if @jdk_version == 17
179179
# No labsjdk-ce-17 in common.json
180180
true
181-
elsif @jdk_version == 20
182-
# No labsjdk-ee-20 yet, so use ce if JDK 20
183-
false
184181
else
185182
ee?
186183
end

0 commit comments

Comments
 (0)