Skip to content

Commit 9e2a1c3

Browse files
committed
Address "useless neverDefault" warnings
1 parent f704579 commit 9e2a1c3

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

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
}

0 commit comments

Comments
 (0)