Skip to content

Commit fcf60ad

Browse files
author
Nicolas Laurent
committed
@cached(parameters = "PRIVATE") DispatchNode: drop the parameters
1 parent 4705dfd commit fcf60ad

File tree

18 files changed

+69
-69
lines changed

18 files changed

+69
-69
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -968,13 +968,13 @@ protected Object value(Object[] args) {
968968

969969
@Specialization
970970
protected Object fillFallback(VirtualFrame frame, RubyArray array, Object[] args, NotProvided block,
971-
@Cached(parameters = "PRIVATE") DispatchNode callFillInternal) {
971+
@Cached DispatchNode callFillInternal) {
972972
return callFillInternal.call(array, "fill_internal", args);
973973
}
974974

975975
@Specialization
976976
protected Object fillFallback(VirtualFrame frame, RubyArray array, Object[] args, RubyProc block,
977-
@Cached(parameters = "PRIVATE") DispatchNode callFillInternal) {
977+
@Cached DispatchNode callFillInternal) {
978978
return callFillInternal.callWithBlock(array, "fill_internal", block, args);
979979
}
980980

@@ -989,7 +989,7 @@ public abstract static class HashNode extends ArrayCoreMethodNode {
989989
@Specialization(limit = "storageStrategyLimit()")
990990
protected long hash(VirtualFrame frame, RubyArray array,
991991
@CachedLibrary("array.store") ArrayStoreLibrary stores,
992-
@Cached(parameters = "PRIVATE") DispatchNode toHashNode,
992+
@Cached DispatchNode toHashNode,
993993
@Cached ToLongNode toLongNode,
994994
@Cached("createCountingProfile()") LoopConditionProfile loopProfile) {
995995
final int size = array.size;
@@ -2093,7 +2093,7 @@ protected RubyArray sortEmpty(RubyArray array, Object unusedBlock) {
20932093
protected RubyArray sortVeryShort(VirtualFrame frame, RubyArray array, NotProvided block,
20942094
@CachedLibrary("array.store") ArrayStoreLibrary originalStores,
20952095
@CachedLibrary(limit = "1") ArrayStoreLibrary stores,
2096-
@Cached(parameters = "PRIVATE") DispatchNode compareDispatchNode,
2096+
@Cached DispatchNode compareDispatchNode,
20972097
@Cached CmpIntNode cmpIntNode) {
20982098
final Object originalStore = array.store;
20992099
final Object store = originalStores
@@ -2155,13 +2155,13 @@ protected Object sortPrimitiveArrayNoBlock(RubyArray array, NotProvided block,
21552155
limit = "storageStrategyLimit()")
21562156
protected Object sortArrayWithoutBlock(RubyArray array, NotProvided block,
21572157
@CachedLibrary("array.store") ArrayStoreLibrary stores,
2158-
@Cached(parameters = "PRIVATE") DispatchNode fallbackNode) {
2158+
@Cached DispatchNode fallbackNode) {
21592159
return fallbackNode.call(array, "sort_fallback");
21602160
}
21612161

21622162
@Specialization(guards = "!isEmptyArray(array)")
21632163
protected Object sortGenericWithBlock(RubyArray array, RubyProc block,
2164-
@Cached(parameters = "PRIVATE") DispatchNode fallbackNode) {
2164+
@Cached DispatchNode fallbackNode) {
21652165
return fallbackNode.callWithBlock(array, "sort_fallback", block);
21662166
}
21672167

src/main/java/org/truffleruby/core/cast/CmpIntNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ private String formatMessage(Object receiver, Object other) {
7979

8080
@Specialization(guards = { "!isRubyInteger(value)", "!isNil(value)" })
8181
protected int cmpObject(Object value, Object receiver, Object other,
82-
@Cached(parameters = "PRIVATE") DispatchNode gtNode,
83-
@Cached(parameters = "PRIVATE") DispatchNode ltNode,
82+
@Cached DispatchNode gtNode,
83+
@Cached DispatchNode ltNode,
8484
@Cached BooleanCastNode gtCastNode,
8585
@Cached BooleanCastNode ltCastNode) {
8686

src/main/java/org/truffleruby/core/cast/SplatCastNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected RubyArray splat(VirtualFrame frame, RubyArray array) {
9292

9393
@Specialization(guards = { "!isNil(object)", "!isRubyArray(object)" })
9494
protected RubyArray splat(VirtualFrame frame, Object object,
95-
@Cached(parameters = "PRIVATE") DispatchNode toArrayNode) {
95+
@Cached DispatchNode toArrayNode) {
9696
final Object array = toArrayNode.call(
9797
coreLibrary().truffleTypeModule,
9898
"rb_check_convert_type",

src/main/java/org/truffleruby/core/cast/ToPathNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected RubyString coerceRubyString(RubyString path) {
2828

2929
@Specialization(guards = "!isRubyString(object)")
3030
protected RubyString coerceObject(Object object,
31-
@Cached(parameters = "PRIVATE") DispatchNode toPathNode) {
31+
@Cached DispatchNode toPathNode) {
3232
return (RubyString) toPathNode.call(coreLibrary().truffleTypeModule, "coerce_to_path", object);
3333
}
3434

src/main/java/org/truffleruby/core/cast/ToProcNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected RubyProc doRubyProc(RubyProc proc) {
3838

3939
@Specialization(guards = { "!isNil(object)", "!isRubyProc(object)" })
4040
protected RubyProc doObject(VirtualFrame frame, Object object,
41-
@Cached(parameters = "PRIVATE") DispatchNode toProc,
41+
@Cached DispatchNode toProc,
4242
@Cached BranchProfile errorProfile) {
4343
final Object coerced;
4444
try {

src/main/java/org/truffleruby/core/cast/ToSNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected RubyString toS(RubyString string) {
3333

3434
@Specialization(guards = "!isRubyString(object)")
3535
protected RubyString toSFallback(VirtualFrame frame, Object object,
36-
@Cached(parameters = "PRIVATE") DispatchNode callToSNode) {
36+
@Cached DispatchNode callToSNode) {
3737
final Object value = callToSNode.call(object, "to_s");
3838

3939
if (value instanceof RubyString) {

src/main/java/org/truffleruby/core/cast/ToStrNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected RubyString coerceRubyString(RubyString string) {
3939
@Specialization(guards = "!isRubyString(object)")
4040
protected RubyString coerceObject(Object object,
4141
@Cached BranchProfile errorProfile,
42-
@Cached(parameters = "PRIVATE") DispatchNode toStrNode) {
42+
@Cached DispatchNode toStrNode) {
4343
final Object coerced;
4444
try {
4545
coerced = toStrNode.call(object, "to_str");

src/main/java/org/truffleruby/core/hash/HashNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ protected RubyHash replaceBuckets(RubyHash self, RubyHash from) {
638638

639639
@Specialization(guards = "!isRubyHash(from)")
640640
protected RubyHash replaceCoerce(RubyHash self, Object from,
641-
@Cached(parameters = "PRIVATE") DispatchNode coerceNode,
641+
@Cached DispatchNode coerceNode,
642642
@Cached InitializeCopyNode initializeCopyNode) {
643643
final Object otherHash = coerceNode.call(
644644
coreLibrary().truffleTypeModule,

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ protected Object dup(Object self,
643643
@Cached IsImmutableObjectNode isImmutableObjectNode,
644644
@Cached ConditionProfile immutableProfile,
645645
@Cached CopyNode copyNode,
646-
@Cached(parameters = "PRIVATE") DispatchNode initializeDupNode) {
646+
@Cached DispatchNode initializeDupNode) {
647647
if (immutableProfile.profile(isImmutableObjectNode.execute(self))) {
648648
return self;
649649
}

src/main/java/org/truffleruby/core/numeric/FloatNodes.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected double add(double a, RubyBignum b) {
7676

7777
@Specialization(guards = "!isRubyNumber(b)")
7878
protected Object addCoerced(double a, Object b,
79-
@Cached(parameters = "PRIVATE") DispatchNode redoCoerced) {
79+
@Cached DispatchNode redoCoerced) {
8080
return redoCoerced.call(a, "redo_coerced", CoreSymbols.PLUS, b);
8181
}
8282
}
@@ -101,7 +101,7 @@ protected double sub(double a, RubyBignum b) {
101101

102102
@Specialization(guards = "!isRubyNumber(b)")
103103
protected Object subCoerced(double a, Object b,
104-
@Cached(parameters = "PRIVATE") DispatchNode redoCoerced) {
104+
@Cached DispatchNode redoCoerced) {
105105
return redoCoerced.call(a, "redo_coerced", CoreSymbols.MINUS, b);
106106
}
107107

@@ -127,7 +127,7 @@ protected double mul(double a, RubyBignum b) {
127127

128128
@Specialization(guards = "!isRubyNumber(b)")
129129
protected Object mulCoerced(double a, Object b,
130-
@Cached(parameters = "PRIVATE") DispatchNode redoCoerced) {
130+
@Cached DispatchNode redoCoerced) {
131131
return redoCoerced.call(a, "redo_coerced", CoreSymbols.MULTIPLY, b);
132132
}
133133

@@ -183,7 +183,7 @@ protected double pow(double base, RubyBignum exponent) {
183183

184184
@Specialization(guards = "!isRubyNumber(exponent)")
185185
protected Object powCoerced(double base, Object exponent,
186-
@Cached(parameters = "PRIVATE") DispatchNode redoCoerced) {
186+
@Cached DispatchNode redoCoerced) {
187187
return redoCoerced.call(base, "redo_coerced", CoreSymbols.POW, exponent);
188188
}
189189

@@ -209,7 +209,7 @@ protected double div(double a, RubyBignum b) {
209209

210210
@Specialization(guards = "!isRubyNumber(b)")
211211
protected Object divCoerced(double a, Object b,
212-
@Cached(parameters = "PRIVATE") DispatchNode redoCoerced) {
212+
@Cached DispatchNode redoCoerced) {
213213
return redoCoerced.call(a, "redo_coerced", CoreSymbols.DIVIDE, b);
214214
}
215215

@@ -255,7 +255,7 @@ protected double mod(double a, RubyBignum b) {
255255

256256
@Specialization(guards = "!isRubyNumber(b)")
257257
protected Object modCoerced(double a, Object b,
258-
@Cached(parameters = "PRIVATE") DispatchNode redoCoerced) {
258+
@Cached DispatchNode redoCoerced) {
259259
return redoCoerced.call(a, "redo_coerced", CoreSymbols.MODULO, b);
260260
}
261261

@@ -283,7 +283,7 @@ protected RubyArray divMod(double a, RubyBignum b) {
283283

284284
@Specialization(guards = "!isRubyBignum(b)")
285285
protected Object divModCoerced(double a, RubyDynamicObject b,
286-
@Cached(parameters = "PRIVATE") DispatchNode redoCoerced) {
286+
@Cached DispatchNode redoCoerced) {
287287
return redoCoerced.call(a, "redo_coerced", CoreSymbols.DIVMOD, b);
288288
}
289289

@@ -309,7 +309,7 @@ protected boolean lessBignum(double a, RubyBignum b) {
309309

310310
@Specialization(guards = "!isRubyNumber(b)")
311311
protected Object lessCoerced(double a, Object b,
312-
@Cached(parameters = "PRIVATE") DispatchNode redoCompare) {
312+
@Cached DispatchNode redoCompare) {
313313
return redoCompare.call(a, "redo_compare", CoreSymbols.LESS_THAN, b);
314314
}
315315
}
@@ -334,7 +334,7 @@ protected boolean lessEqual(double a, RubyBignum b) {
334334

335335
@Specialization(guards = "!isRubyNumber(b)")
336336
protected Object lessEqualCoerced(double a, Object b,
337-
@Cached(parameters = "PRIVATE") DispatchNode redoCompare) {
337+
@Cached DispatchNode redoCompare) {
338338
return redoCompare.call(a, "redo_compare", CoreSymbols.LEQ, b);
339339
}
340340
}
@@ -419,13 +419,13 @@ protected int compare(double a, double b) {
419419

420420
@Specialization(guards = { "!isNaN(a)", "!isRubyBignum(b)" })
421421
protected Object compare(double a, RubyDynamicObject b,
422-
@Cached(parameters = "PRIVATE") DispatchNode redoCompare) {
422+
@Cached DispatchNode redoCompare) {
423423
return redoCompare.call(a, "redo_compare_bad_coerce_return_error", b);
424424
}
425425

426426
@Specialization(guards = { "!isNaN(a)" })
427427
protected Object compare(double a, Nil b,
428-
@Cached(parameters = "PRIVATE") DispatchNode redoCompare) {
428+
@Cached DispatchNode redoCompare) {
429429
return redoCompare.call(a, "redo_compare_bad_coerce_return_error", b);
430430
}
431431

@@ -451,7 +451,7 @@ protected boolean greaterEqual(double a, RubyBignum b) {
451451

452452
@Specialization(guards = "!isRubyNumber(b)")
453453
protected Object greaterEqualCoerced(double a, Object b,
454-
@Cached(parameters = "PRIVATE") DispatchNode redoCompare) {
454+
@Cached DispatchNode redoCompare) {
455455
return redoCompare.call(a, "redo_compare", CoreSymbols.GEQ, b);
456456
}
457457

@@ -477,7 +477,7 @@ protected boolean greater(double a, RubyBignum b) {
477477

478478
@Specialization(guards = "!isRubyNumber(b)")
479479
protected Object greaterCoerced(double a, Object b,
480-
@Cached(parameters = "PRIVATE") DispatchNode redoCompare) {
480+
@Cached DispatchNode redoCompare) {
481481
return redoCompare.call(a, "redo_compare", CoreSymbols.GREATER_THAN, b);
482482
}
483483
}

0 commit comments

Comments
 (0)