Skip to content

Commit 2ad933b

Browse files
committed
Simplify
1 parent 81fcc24 commit 2ad933b

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,7 @@ protected RubyArray associated(RubyString string) {
933933
@TruffleBoundary
934934
@Specialization
935935
protected RubyArray associated(ImmutableRubyString string) {
936-
final long[] associatedValues = new long[0];
937-
return ArrayHelpers.createArray(getContext(), getLanguage(), associatedValues);
936+
return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
938937
}
939938

940939
}

src/main/java/org/truffleruby/interop/InteropNodes.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ public abstract static class EvalNode extends CoreMethodArrayArgumentsNode {
232232

233233
@Specialization(
234234
guards = {
235+
"stringsMimeType.isRubyString(mimeType)",
236+
"stringsSource.isRubyString(source)",
235237
"mimeTypeEqualNode.execute(stringsMimeType.getRope(mimeType), cachedMimeType)",
236238
"sourceEqualNode.execute(stringsSource.getRope(source), cachedSource)" },
237239
limit = "getCacheLimit()")
@@ -246,9 +248,9 @@ protected Object evalCached(Object mimeType, Object source,
246248
return callNode.call(EMPTY_ARGUMENTS);
247249
}
248250

249-
@Specialization(guards = {
250-
"stringsMimeType.isRubyString(mimeType)",
251-
"stringsSource.isRubyString(source)" }, replaces = "evalCached")
251+
@Specialization(
252+
guards = { "stringsMimeType.isRubyString(mimeType)", "stringsSource.isRubyString(source)" },
253+
replaces = "evalCached")
252254
protected Object evalUncached(Object mimeType, RubyString source,
253255
@CachedLibrary(limit = "2") RubyStringLibrary stringsMimeType,
254256
@CachedLibrary(limit = "2") RubyStringLibrary stringsSource,

src/main/java/org/truffleruby/interop/PolyglotNodes.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public abstract static class EvalNode extends CoreMethodArrayArgumentsNode {
4545

4646
@Specialization(
4747
guards = {
48+
"stringsId.isRubyString(id)",
49+
"stringsSource.isRubyString(source)",
4850
"idEqualNode.execute(stringsId.getRope(id), cachedMimeType)",
4951
"sourceEqualNode.execute(stringsSource.getRope(source), cachedSource)" },
5052
limit = "getCacheLimit()")
@@ -59,9 +61,9 @@ protected Object evalCached(Object id, Object source,
5961
return callNode.call(EMPTY_ARGUMENTS);
6062
}
6163

62-
@Specialization(guards = {
63-
"stringsId.isRubyString(id)",
64-
"stringsSource.isRubyString(source)" }, replaces = "evalCached")
64+
@Specialization(
65+
guards = { "stringsId.isRubyString(id)", "stringsSource.isRubyString(source)" },
66+
replaces = "evalCached")
6567
protected Object evalUncached(Object id, Object source,
6668
@CachedLibrary(limit = "2") RubyStringLibrary stringsId,
6769
@CachedLibrary(limit = "2") RubyStringLibrary stringsSource,

0 commit comments

Comments
 (0)