Skip to content

Commit 4c6e74e

Browse files
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/3229
2 parents 1c888c9 + bf9ec68 commit 4c6e74e

File tree

13 files changed

+61
-67
lines changed

13 files changed

+61
-67
lines changed

common.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
"jdks": {
55
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
66
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
7-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.15+2-jvmci-22.1-b01", "platformspecific": true },
8-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.15+2-jvmci-22.1-b01-sulong", "platformspecific": true },
9-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.14+6-jvmci-22.1-b01", "platformspecific": true },
10-
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.14+6-jvmci-22.1-b01-sulong", "platformspecific": true },
7+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.15+4-jvmci-22.1-b02", "platformspecific": true },
8+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.15+4-jvmci-22.1-b02-sulong", "platformspecific": true },
9+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.15+7-jvmci-22.1-b02", "platformspecific": true },
10+
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.15+7-jvmci-22.1-b02-sulong", "platformspecific": true },
1111

1212
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
13-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.3+2-jvmci-22.1-b01", "platformspecific": true },
14-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.3+2-jvmci-22.1-b01-debug", "platformspecific": true },
15-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.3+2-jvmci-22.1-b01-sulong", "platformspecific": true },
16-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.3+6-jvmci-22.1-b01", "platformspecific": true },
17-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.3+6-jvmci-22.1-b01-debug", "platformspecific": true },
18-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.3+6-jvmci-22.1-b01-sulong", "platformspecific": true }
13+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b02", "platformspecific": true },
14+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b02-debug", "platformspecific": true },
15+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b02-sulong", "platformspecific": true },
16+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.3+7-jvmci-22.1-b02", "platformspecific": true },
17+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.3+7-jvmci-22.1-b02-debug", "platformspecific": true },
18+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.3+7-jvmci-22.1-b02-sulong", "platformspecific": true }
1919
},
2020

2121
"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)",

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": "85c258963b605f95061b37a912a633b1bf1a1c0f",
10+
"version": "133a7d86a7938f0a677c88b295851d4c2b56b792",
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": "85c258963b605f95061b37a912a633b1bf1a1c0f",
19+
"version": "133a7d86a7938f0a677c88b295851d4c2b56b792",
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/RubyLanguage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public static final class ThreadLocalState {
230230
private final LanguageArray<Assumption> globalVariableNeverAliasedAssumptions = new LanguageArray<>(
231231
globalVariablesMap,
232232
Assumption[]::new,
233-
() -> Truffle.getRuntime().createAssumption("global variable was never aliased: "));
233+
() -> Assumption.create("global variable was never aliased: "));
234234

235235
private static final RubyObjectType objectType = new RubyObjectType();
236236

src/main/java/org/truffleruby/core/array/ArrayEachIteratorNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected RubyArray iterateMany(RubyArray array, RubyProc block, int startAt, Ar
4848
@CachedLibrary("array.store") ArrayStoreLibrary stores,
4949
// Checkstyle: resume
5050
@Cached LoopConditionProfile loopProfile,
51-
@Cached("createIdentityProfile()") IntValueProfile arraySizeProfile,
51+
@Cached IntValueProfile arraySizeProfile,
5252
@Cached ConditionProfile strategyMatchProfile) {
5353
int i = startAt;
5454
try {

0 commit comments

Comments
 (0)