Skip to content

Commit 36b0f41

Browse files
msimacekmsimacek
committed
Fix warnings about unnecessary limit expressions
1 parent da58247 commit 36b0f41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+235
-237
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BinasciiModuleBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ byte readByte(int byteOffset,
138138
}
139139
}
140140

141-
@Specialization(guards = "isAscii(value, getCodeRangeNode)", limit = "1")
141+
@Specialization(guards = "isAscii(value, getCodeRangeNode)")
142142
Object asciiString(TruffleString value,
143143
@Shared("getCodeRange") @Cached @SuppressWarnings("unused") TruffleString.GetCodeRangeNode getCodeRangeNode) {
144144
return new AsciiStringBuffer(value);
145145
}
146146

147-
@Specialization(guards = "!isAscii(value, getCodeRangeNode)", limit = "1")
147+
@Specialization(guards = "!isAscii(value, getCodeRangeNode)")
148148
Object nonAsciiString(@SuppressWarnings("unused") TruffleString value,
149149
@Shared("getCodeRange") @Cached @SuppressWarnings("unused") TruffleString.GetCodeRangeNode getCodeRangeNode) {
150150
throw raise(ValueError, ErrorMessages.STRING_ARG_SHOULD_CONTAIN_ONLY_ASCII);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,14 @@ Object dontCallBytes(VirtualFrame frame, Object cls, Object source, Object encod
336336
abstract static class CreateBytes extends PNodeWithContext {
337337
abstract Object execute(Node inliningTarget, Object cls, byte[] bytes);
338338

339-
@Specialization(guards = "!needsNativeAllocationNode.execute(inliningTarget, cls)", limit = "1")
339+
@Specialization(guards = "!needsNativeAllocationNode.execute(inliningTarget, cls)")
340340
static PBytes doManaged(@SuppressWarnings("unused") Node inliningTarget, Object cls, byte[] bytes,
341341
@SuppressWarnings("unused") @Shared @Cached TypeNodes.NeedsNativeAllocationNode needsNativeAllocationNode,
342342
@Cached PythonObjectFactory factory) {
343343
return factory.createBytes(cls, bytes);
344344
}
345345

346-
@Specialization(guards = "needsNativeAllocationNode.execute(inliningTarget, cls)", limit = "1")
346+
@Specialization(guards = "needsNativeAllocationNode.execute(inliningTarget, cls)")
347347
static Object doNative(@SuppressWarnings("unused") Node inliningTarget, Object cls, byte[] bytes,
348348
@SuppressWarnings("unused") @Shared @Cached TypeNodes.NeedsNativeAllocationNode needsNativeAllocationNode,
349349
@Cached PythonToNativeNode toNative,
@@ -966,51 +966,51 @@ abstract static class FloatNode extends PythonBinaryBuiltinNode {
966966
// Used for the recursive call
967967
protected abstract double executeDouble(VirtualFrame frame, PythonBuiltinClassType cls, Object arg) throws UnexpectedResultException;
968968

969-
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", limit = "1")
969+
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)")
970970
static double floatFromDouble(@SuppressWarnings("unused") Object cls, double arg,
971971
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
972972
@SuppressWarnings("unused") @Shared("isFloat") @Cached InlineIsBuiltinClassProfile isPrimitiveFloatProfile) {
973973
return arg;
974974
}
975975

976-
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", limit = "1")
976+
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)")
977977
static double floatFromInt(@SuppressWarnings("unused") Object cls, int arg,
978978
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
979979
@SuppressWarnings("unused") @Shared("isFloat") @Cached InlineIsBuiltinClassProfile isPrimitiveFloatProfile) {
980980
return arg;
981981
}
982982

983-
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", limit = "1")
983+
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)")
984984
static double floatFromLong(@SuppressWarnings("unused") Object cls, long arg,
985985
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
986986
@SuppressWarnings("unused") @Shared("isFloat") @Cached InlineIsBuiltinClassProfile isPrimitiveFloatProfile) {
987987
return arg;
988988
}
989989

990-
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", limit = "1")
990+
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)")
991991
static double floatFromBoolean(@SuppressWarnings("unused") Object cls, boolean arg,
992992
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
993993
@SuppressWarnings("unused") @Shared("isFloat") @Cached InlineIsBuiltinClassProfile isPrimitiveFloatProfile) {
994994
return arg ? 1d : 0d;
995995
}
996996

997-
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", limit = "1")
997+
@Specialization(guards = "isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)")
998998
static double floatFromString(VirtualFrame frame, @SuppressWarnings("unused") Object cls, TruffleString obj,
999999
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
10001000
@SuppressWarnings("unused") @Shared("isFloat") @Cached InlineIsBuiltinClassProfile isPrimitiveFloatProfile,
10011001
@Shared("fromString") @Cached PyFloatFromString fromString) {
10021002
return fromString.execute(frame, obj);
10031003
}
10041004

1005-
@Specialization(guards = {"isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", "isNoValue(obj)"}, limit = "1")
1005+
@Specialization(guards = {"isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", "isNoValue(obj)"})
10061006
static double floatFromNoValue(@SuppressWarnings("unused") Object cls, @SuppressWarnings("unused") PNone obj,
10071007
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
10081008
@SuppressWarnings("unused") @Shared("isFloat") @Cached InlineIsBuiltinClassProfile isPrimitiveFloatProfile) {
10091009
return 0.0;
10101010
}
10111011

10121012
@Specialization(guards = {"isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", "!isNoValue(obj)"}, //
1013-
replaces = "floatFromString", limit = "1")
1013+
replaces = "floatFromString")
10141014
static double floatFromObject(VirtualFrame frame, @SuppressWarnings("unused") Object cls, Object obj,
10151015
@Bind("this") Node inliningTarget,
10161016
@SuppressWarnings("unused") @Shared("isFloat") @Cached InlineIsBuiltinClassProfile isPrimitiveFloatProfile,
@@ -1026,8 +1026,7 @@ static double floatFromObject(VirtualFrame frame, @SuppressWarnings("unused") Ob
10261026
@Specialization(guards = {
10271027
"!needsNativeAllocationNode.execute(inliningTarget, cls)", //
10281028
"!isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)", //
1029-
"isNoValue(obj)"}, //
1030-
limit = "1")
1029+
"isNoValue(obj)"})
10311030
Object floatFromNoneManagedSubclass(Object cls, PNone obj,
10321031
@Bind("this") Node inliningTarget,
10331032
@SuppressWarnings("unused") @Shared @Cached TypeNodes.NeedsNativeAllocationNode needsNativeAllocationNode,
@@ -1037,8 +1036,7 @@ Object floatFromNoneManagedSubclass(Object cls, PNone obj,
10371036

10381037
@Specialization(guards = {
10391038
"!needsNativeAllocationNode.execute(inliningTarget, cls)", //
1040-
"!isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)"}, //
1041-
limit = "1")
1039+
"!isPrimitiveFloat(this, cls, isPrimitiveFloatProfile)"})
10421040
Object floatFromObjectManagedSubclass(VirtualFrame frame, Object cls, Object obj,
10431041
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
10441042
@SuppressWarnings("unused") @Shared @Cached TypeNodes.NeedsNativeAllocationNode needsNativeAllocationNode,
@@ -1089,14 +1087,14 @@ public PFrozenSet frozensetEmpty(Object cls, @SuppressWarnings("unused") PNone a
10891087
return factory().createFrozenSet(cls);
10901088
}
10911089

1092-
@Specialization(guards = "isBuiltinClass.profileIsAnyBuiltinClass(inliningTarget, cls)", limit = "1")
1090+
@Specialization(guards = "isBuiltinClass.profileIsAnyBuiltinClass(inliningTarget, cls)")
10931091
public static PFrozenSet frozensetIdentity(@SuppressWarnings("unused") Object cls, PFrozenSet arg,
10941092
@Bind("this") Node inliningTarget,
10951093
@Shared("isBuiltinProfile") @SuppressWarnings("unused") @Cached IsAnyBuiltinClassProfile isBuiltinClass) {
10961094
return arg;
10971095
}
10981096

1099-
@Specialization(guards = "!isBuiltinClass.profileIsAnyBuiltinClass(inliningTarget, cls)", limit = "1")
1097+
@Specialization(guards = "!isBuiltinClass.profileIsAnyBuiltinClass(inliningTarget, cls)")
11001098
public PFrozenSet subFrozensetIdentity(Object cls, PFrozenSet arg,
11011099
@Bind("this") Node inliningTarget,
11021100
@Shared("isBuiltinProfile") @SuppressWarnings("unused") @Cached IsAnyBuiltinClassProfile isBuiltinClass) {
@@ -2111,7 +2109,7 @@ public final Object executeWith(VirtualFrame frame, Object arg) {
21112109

21122110
public abstract Object executeWith(VirtualFrame frame, Object cls, Object arg, Object encoding, Object errors);
21132111

2114-
@Specialization(guards = {"!needsNativeAllocationNode.execute(inliningTarget, cls)", "isNoValue(arg)"}, limit = "1")
2112+
@Specialization(guards = {"!needsNativeAllocationNode.execute(inliningTarget, cls)", "isNoValue(arg)"})
21152113
@SuppressWarnings("unused")
21162114
Object strNoArgs(Object cls, PNone arg, Object encoding, Object errors,
21172115
@Bind("this") Node inliningTarget,
@@ -2120,7 +2118,7 @@ Object strNoArgs(Object cls, PNone arg, Object encoding, Object errors,
21202118
return asPString(cls, T_EMPTY_STRING, inliningTarget, isPrimitiveProfile);
21212119
}
21222120

2123-
@Specialization(guards = {"!needsNativeAllocationNode.execute(inliningTarget, cls)", "!isNoValue(obj)", "isNoValue(encoding)", "isNoValue(errors)"}, limit = "1")
2121+
@Specialization(guards = {"!needsNativeAllocationNode.execute(inliningTarget, cls)", "!isNoValue(obj)", "isNoValue(encoding)", "isNoValue(errors)"})
21242122
Object strOneArg(VirtualFrame frame, Object cls, Object obj, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors,
21252123
@Bind("this") Node inliningTarget,
21262124
@SuppressWarnings("unused") @Shared @Cached TypeNodes.NeedsNativeAllocationNode needsNativeAllocationNode,
@@ -2259,7 +2257,7 @@ public static StrNode create() {
22592257
@GenerateNodeFactory
22602258
public abstract static class TupleNode extends PythonBinaryBuiltinNode {
22612259

2262-
@Specialization(guards = "!needsNativeAllocationNode.execute(inliningTarget, cls)", limit = "1")
2260+
@Specialization(guards = "!needsNativeAllocationNode.execute(inliningTarget, cls)")
22632261
static PTuple constructTuple(VirtualFrame frame, Object cls, Object iterable,
22642262
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
22652263
@SuppressWarnings("unused") @Shared @Cached TypeNodes.NeedsNativeAllocationNode needsNativeAllocationNode,
@@ -2908,7 +2906,7 @@ public final Object varArgExecute(VirtualFrame frame, Object self, Object[] argu
29082906
return execute(frame, arguments[0], argsWithoutSelf, keywords);
29092907
}
29102908

2911-
@Specialization(guards = "!needsNativeAllocationNode.execute(inliningTarget, cls)", limit = "1")
2909+
@Specialization(guards = "!needsNativeAllocationNode.execute(inliningTarget, cls)")
29122910
static Object doManaged(Object cls, @SuppressWarnings("unused") Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs,
29132911
@Bind("this") Node inliningTarget,
29142912
@SuppressWarnings("unused") @Shared @Cached TypeNodes.NeedsNativeAllocationNode needsNativeAllocationNode,
@@ -2921,7 +2919,7 @@ static Object doManaged(Object cls, @SuppressWarnings("unused") Object[] args, @
29212919
}
29222920
}
29232921

2924-
@Specialization(guards = "needsNativeAllocationNode.execute(inliningTarget, cls)", limit = "1")
2922+
@Specialization(guards = "needsNativeAllocationNode.execute(inliningTarget, cls)")
29252923
static Object doNativeSubtype(Object cls, Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs,
29262924
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
29272925
@SuppressWarnings("unused") @Shared @Cached TypeNodes.NeedsNativeAllocationNode needsNativeAllocationNode,

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@
115115
import com.oracle.graal.python.builtins.Python3Core;
116116
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
117117
import com.oracle.graal.python.builtins.PythonBuiltins;
118+
import com.oracle.graal.python.builtins.modules.WarningsModuleBuiltins.WarnNode;
118119
import com.oracle.graal.python.builtins.modules.BuiltinFunctionsFactory.GetAttrNodeFactory;
119120
import com.oracle.graal.python.builtins.modules.BuiltinFunctionsFactory.HexNodeFactory;
120121
import com.oracle.graal.python.builtins.modules.BuiltinFunctionsFactory.OctNodeFactory;
121-
import com.oracle.graal.python.builtins.modules.WarningsModuleBuiltins.WarnNode;
122122
import com.oracle.graal.python.builtins.modules.ast.AstModuleBuiltins;
123123
import com.oracle.graal.python.builtins.modules.io.IOModuleBuiltins;
124124
import com.oracle.graal.python.builtins.modules.io.IONodes;
@@ -461,23 +461,23 @@ protected boolean doHashStorage(VirtualFrame frame, HashingStorage hashingStorag
461461
@GenerateNodeFactory
462462
public abstract static class AllNode extends PythonUnaryBuiltinNode {
463463

464-
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)", limit = "1")
464+
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
465465
static boolean doList(VirtualFrame frame, PList object,
466466
@Bind("this") Node inliningTarget,
467467
@SuppressWarnings("unused") @Shared("getClassNode") @Cached(inline = true) GetPythonObjectClassNode getClassNode,
468468
@Shared("allOrAnySeqNode") @Cached AllOrAnySequenceStorageNode allOrAnyNode) {
469469
return allOrAnyNode.execute(frame, inliningTarget, object.getSequenceStorage(), AnyOrAllNodeType.ALL);
470470
}
471471

472-
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)", limit = "1")
472+
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
473473
static boolean doTuple(VirtualFrame frame, PTuple object,
474474
@Bind("this") Node inliningTarget,
475475
@SuppressWarnings("unused") @Shared("getClassNode") @Cached(inline = true) GetPythonObjectClassNode getClassNode,
476476
@Shared("allOrAnySeqNode") @Cached AllOrAnySequenceStorageNode allOrAnyNode) {
477477
return allOrAnyNode.execute(frame, inliningTarget, object.getSequenceStorage(), AnyOrAllNodeType.ALL);
478478
}
479479

480-
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)", limit = "1")
480+
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
481481
static boolean doHashColl(VirtualFrame frame, PHashingCollection object,
482482
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
483483
@SuppressWarnings("unused") @Shared("getClassNode") @Cached(inline = true) GetPythonObjectClassNode getClassNode,
@@ -519,23 +519,23 @@ boolean doObject(VirtualFrame frame, Object object,
519519
@GenerateNodeFactory
520520
public abstract static class AnyNode extends PythonUnaryBuiltinNode {
521521

522-
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)", limit = "1")
522+
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
523523
static boolean doList(VirtualFrame frame, PList object,
524524
@Bind("this") Node inliningTarget,
525525
@SuppressWarnings("unused") @Shared("getClassNode") @Cached(inline = true) GetPythonObjectClassNode getClassNode,
526526
@Shared("allOrAnySeqNode") @Cached AllOrAnySequenceStorageNode allOrAnyNode) {
527527
return allOrAnyNode.execute(frame, inliningTarget, object.getSequenceStorage(), AnyOrAllNodeType.ANY);
528528
}
529529

530-
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)", limit = "1")
530+
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
531531
static boolean doTuple(VirtualFrame frame, PTuple object,
532532
@Bind("this") Node inliningTarget,
533533
@SuppressWarnings("unused") @Shared("getClassNode") @Cached(inline = true) GetPythonObjectClassNode getClassNode,
534534
@Shared("allOrAnySeqNode") @Cached AllOrAnySequenceStorageNode allOrAnyNode) {
535535
return allOrAnyNode.execute(frame, inliningTarget, object.getSequenceStorage(), AnyOrAllNodeType.ANY);
536536
}
537537

538-
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)", limit = "1")
538+
@Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
539539
static boolean doHashColl(VirtualFrame frame, PHashingCollection object,
540540
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
541541
@SuppressWarnings("unused") @Shared("getClassNode") @Cached(inline = true) GetPythonObjectClassNode getClassNode,
@@ -1313,7 +1313,7 @@ public static GetAttrNode create() {
13131313
public abstract Object executeWithArgs(VirtualFrame frame, Object primary, TruffleString name, Object defaultValue);
13141314

13151315
@SuppressWarnings({"unused", "truffle-static-method"})
1316-
@Specialization(limit = "getAttributeAccessInlineCacheMaxDepth()", guards = {"stringEquals(cachedName, name, equalNode, inliningTarget, stringProfile)", "isNoValue(defaultValue)"})
1316+
@Specialization(guards = {"stringEquals(cachedName, name, equalNode, inliningTarget, stringProfile)", "isNoValue(defaultValue)"})
13171317
public Object getAttrDefault(VirtualFrame frame, Object primary, TruffleString name, PNone defaultValue,
13181318
@Bind("this") Node inliningTarget,
13191319
@Shared @Cached InlinedConditionProfile stringProfile,
@@ -1324,7 +1324,7 @@ public Object getAttrDefault(VirtualFrame frame, Object primary, TruffleString n
13241324
}
13251325

13261326
@SuppressWarnings({"unused", "truffle-static-method"})
1327-
@Specialization(limit = "getAttributeAccessInlineCacheMaxDepth()", guards = {"stringEquals(cachedName, name, equalNode, inliningTarget, stringProfile)", "!isNoValue(defaultValue)"})
1327+
@Specialization(guards = {"stringEquals(cachedName, name, equalNode, inliningTarget, stringProfile)", "!isNoValue(defaultValue)"})
13281328
Object getAttr(VirtualFrame frame, Object primary, TruffleString name, Object defaultValue,
13291329
@Bind("this") Node inliningTarget,
13301330
@Shared @Cached InlinedConditionProfile stringProfile,

0 commit comments

Comments
 (0)