Skip to content

Commit 7e5e57d

Browse files
OracleLabsAutomationeregon
authored andcommitted
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/3903
2 parents a86c964 + aa628c3 commit 7e5e57d

File tree

11 files changed

+25
-27
lines changed

11 files changed

+25
-27
lines changed

common.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "6.27.5",
7+
"mx_version": "6.27.6",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -46,9 +46,9 @@
4646
},
4747

4848
"eclipse": {
49-
"version": "4.14.0",
50-
"short_version": "4.14",
51-
"timestamp": "201912100610"
49+
"version": "4.26.0",
50+
"short_version": "4.26",
51+
"timestamp": "202211231800"
5252
},
5353

5454
"pip": {

mx.truffleruby/suite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
suite = {
2-
"mxversion": "6.27.5",
2+
"mxversion": "6.27.6",
33
"name": "truffleruby",
44

55
"imports": {
66
"suites": [
77
{
88
"name": "regex",
99
"subdir": True,
10-
"version": "f49685115ed0669641559593242832e06a437278",
10+
"version": "53bd3f0cb3f3a4e07d725203f3c352e34c6a845d",
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": "f49685115ed0669641559593242832e06a437278",
19+
"version": "53bd3f0cb3f3a4e07d725203f3c352e34c6a845d",
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/builtins/CoreMethodNodeManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ private static RubyNode transformArgument(CoreMethod method, RubyNode argument,
449449

450450
private static RubyNode transformResult(RubyLanguage language, CoreMethod method, RubyNode node) {
451451
if (!method.enumeratorSize().isEmpty()) {
452-
assert !method.returnsEnumeratorIfNoBlock()
453-
: "Only one of enumeratorSize or returnsEnumeratorIfNoBlock can be specified";
452+
assert !method
453+
.returnsEnumeratorIfNoBlock() : "Only one of enumeratorSize or returnsEnumeratorIfNoBlock can be specified";
454454
// TODO BF 6-27-2015 Handle multiple method names correctly
455455
node = new EnumeratorSizeNode(
456456
language.getSymbol(method.enumeratorSize()),

src/main/java/org/truffleruby/core/exception/ExceptionOperations.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ private String getFallbackMessage(String methodName, Object receiver) {
7676
}
7777

7878
public static Object getExceptionObject(AbstractTruffleException exception) {
79-
assert !(exception instanceof KillException)
80-
: "KillException should not be used as an exception object: " + exception;
79+
assert !(exception instanceof KillException) : "KillException should not be used as an exception object: " +
80+
exception;
8181
if (exception instanceof RaiseException) {
8282
return ((RaiseException) exception).getException();
8383
} else {
@@ -87,8 +87,8 @@ public static Object getExceptionObject(AbstractTruffleException exception) {
8787

8888
public static Object getExceptionObject(Node node, AbstractTruffleException exception,
8989
InlinedConditionProfile raiseExceptionProfile) {
90-
assert !(exception instanceof KillException)
91-
: "KillException should not be used as an exception object: " + exception;
90+
assert !(exception instanceof KillException) : "KillException should not be used as an exception object: " +
91+
exception;
9292
if (raiseExceptionProfile.profile(node, exception instanceof RaiseException)) {
9393
return ((RaiseException) exception).getException();
9494
} else {

src/main/java/org/truffleruby/core/inlined/InlinedIndexSetNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public void assign(VirtualFrame frame, Object value) {
7171

7272
@Override
7373
public AssignableNode toAssignableNode() {
74-
assert getOperand2Node() instanceof NilLiteralNode && ((NilLiteralNode) getOperand2Node()).isImplicit()
75-
: getOperand2Node();
74+
assert getOperand2Node() instanceof NilLiteralNode &&
75+
((NilLiteralNode) getOperand2Node()).isImplicit() : getOperand2Node();
7676
return this;
7777
}
7878

src/main/java/org/truffleruby/core/string/StringNodes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3842,8 +3842,8 @@ protected Object singleByteOptimizable(
38423842
// When single-byte optimizable, the byte length and the codepoint length are the same.
38433843
int stringByteLength = string.byteLength(stringEncoding.tencoding);
38443844

3845-
assert codePointOffset + pattern.byteLength(patternEncoding.tencoding) <= stringByteLength
3846-
: "already checked in the caller, String#index";
3845+
assert codePointOffset + pattern.byteLength(
3846+
patternEncoding.tencoding) <= stringByteLength : "already checked in the caller, String#index";
38473847

38483848
int found = byteIndexOfStringNode.execute(string, pattern, codePointOffset, stringByteLength,
38493849
compatibleEncoding.tencoding);

src/main/java/org/truffleruby/core/thread/RubyThread.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ public RubyFiber getRootFiber() {
121121
}
122122

123123
public RubyFiber getCurrentFiber() {
124-
assert RubyLanguage.getCurrentLanguage().getCurrentThread() == this
125-
: "Trying to read the current Fiber of another Thread which is inherently racy";
124+
assert RubyLanguage.getCurrentLanguage()
125+
.getCurrentThread() == this : "Trying to read the current Fiber of another Thread which is inherently racy";
126126
return currentFiber;
127127
}
128128

src/main/java/org/truffleruby/language/backtrace/Backtrace.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ public RaiseException getRaiseException() {
121121

122122
/** Sets the wrapper for the Ruby exception associated with this backtrace. */
123123
public void setRaiseException(RaiseException raiseException) {
124-
assert this.raiseException == null
125-
: "the RaiseException of a Backtrace must not be set again, otherwise the original backtrace is lost";
124+
assert this.raiseException == null : "the RaiseException of a Backtrace must not be set again, otherwise the original backtrace is lost";
126125
this.raiseException = raiseException;
127126
}
128127

src/main/java/org/truffleruby/language/methods/CallInternalMethodNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ protected static Object alwaysInlined(
102102
@Cached InlinedBranchProfile checkArityProfile,
103103
@Cached InlinedBranchProfile exceptionProfile,
104104
@Bind("this") Node node) {
105-
assert !cachedArity.acceptsKeywords()
106-
: "AlwaysInlinedMethodNodes are currently assumed to not use keyword arguments, the arity check depends on this";
105+
assert !cachedArity
106+
.acceptsKeywords() : "AlwaysInlinedMethodNodes are currently assumed to not use keyword arguments, the arity check depends on this";
107107
assert RubyArguments.getSelf(rubyArgs) == receiver;
108108

109109
if (literalCallNode != null) {

src/main/java/org/truffleruby/language/methods/DeclarationContext.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ public RubyModule[] getRefinementsFor(RubyModule module) {
192192

193193
@TruffleBoundary
194194
public RubyModule getModuleToDefineMethods() {
195-
assert defaultDefinee != null
196-
: "Trying to find the default definee but this method should not have method definitions inside";
195+
assert defaultDefinee != null : "Trying to find the default definee but this method should not have method definitions inside";
197196
return defaultDefinee.getModuleToDefineMethods();
198197
}
199198

0 commit comments

Comments
 (0)