Skip to content

Commit c881345

Browse files
eregoneregon
committed
[GR-67702] Remove redundant @cached(inline = false) for TruffleString nodes
PullRequest: graalpython/3922
2 parents 3c94bfd + ddf8c49 commit c881345

Some content is hidden

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

49 files changed

+127
-127
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ private static String bigToString(int radix, BigInteger x) {
590590
@Specialization
591591
static TruffleString doL(Node inliningTarget, long x, TruffleString prefix, int radix, LongToString longToString,
592592
@Exclusive @Cached InlinedConditionProfile isMinLong,
593-
@Shared @Cached(inline = false) TruffleString.FromJavaStringNode fromJavaStringNode) {
593+
@Shared @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
594594
if (isMinLong.profile(inliningTarget, x == Long.MIN_VALUE)) {
595595
return buildString(true, prefix, fromJavaStringNode.execute(bigToString(radix, longMaxPlusOne()), TS_ENCODING));
596596
}
@@ -599,7 +599,7 @@ static TruffleString doL(Node inliningTarget, long x, TruffleString prefix, int
599599

600600
@Specialization
601601
static TruffleString doPI(PInt x, TruffleString prefix, int radix, @SuppressWarnings("unused") LongToString longToString,
602-
@Shared @Cached(inline = false) TruffleString.FromJavaStringNode fromJavaStringNode) {
602+
@Shared @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
603603
BigInteger value = x.getValue();
604604
return buildString(value.signum() < 0, prefix, fromJavaStringNode.execute(bigToString(radix, PInt.abs(value)), TS_ENCODING));
605605
}
@@ -612,7 +612,7 @@ static TruffleString doO(VirtualFrame frame, Node inliningTarget, Object x, Truf
612612
@Cached InlinedBranchProfile isInt,
613613
@Cached InlinedBranchProfile isLong,
614614
@Cached InlinedBranchProfile isPInt,
615-
@Shared @Cached(inline = false) TruffleString.FromJavaStringNode fromJavaStringNode) {
615+
@Shared @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
616616
Object index = indexNode.execute(frame, inliningTarget, x);
617617
if (index instanceof Boolean || index instanceof Integer) {
618618
isInt.enter(inliningTarget);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static void handle(Node inliningTarget, TruffleEncoder encoder, TruffleString er
222222
@Cached InlinedConditionProfile surrogateescapeProfile,
223223
@Cached InlinedConditionProfile xmlcharrefreplaceProfile,
224224
@Cached PRaiseNode raiseNode,
225-
@Cached(inline = false) TruffleString.EqualNode equalNode,
225+
@Cached TruffleString.EqualNode equalNode,
226226
// TODO: (blocked by GR-46101) make this CallNode.Lazy
227227
@Cached(inline = false) CallNode lazyCallNode) {
228228
boolean fixed;
@@ -398,7 +398,7 @@ public static TruffleString intern(Node inliningTarget, TruffleString errorActio
398398
@Cached InlinedConditionProfile backslashreplaceProfile,
399399
@Cached InlinedConditionProfile surrogatepassProfile,
400400
@Cached InlinedConditionProfile surrogateescapeProfile,
401-
@Cached(inline = false) TruffleString.EqualNode equalNode) {
401+
@Cached TruffleString.EqualNode equalNode) {
402402
if (strictProfile.profile(inliningTarget, equalNode.execute(T_STRICT, errorAction, TS_ENCODING))) {
403403
return T_STRICT;
404404
} else if (backslashreplaceProfile.profile(inliningTarget, equalNode.execute(T_BACKSLASHREPLACE, errorAction, TS_ENCODING))) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3062,8 +3062,8 @@ public abstract static class StringOrBytesToBytesNode extends Node {
30623062
static PBytes doString(Node inliningTarget, Object strObj,
30633063
@Bind PythonLanguage language,
30643064
@Cached CastToTruffleStringNode castToStringNode,
3065-
@Cached(inline = false) TruffleString.SwitchEncodingNode switchEncodingNode,
3066-
@Cached(inline = false) TruffleString.CopyToByteArrayNode copyToByteArrayNode) {
3065+
@Cached TruffleString.SwitchEncodingNode switchEncodingNode,
3066+
@Cached TruffleString.CopyToByteArrayNode copyToByteArrayNode) {
30673067
TruffleString str = castToStringNode.execute(inliningTarget, strObj);
30683068
TruffleString utf8 = switchEncodingNode.execute(str, Encoding.UTF_8);
30693069
byte[] bytes = new byte[utf8.byteLength(Encoding.UTF_8)];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected boolean eq(TruffleString s1, TruffleString s2, TruffleString.EqualNode
106106
@SuppressWarnings("unused")
107107
static PStruct doCachedString(PythonModule module, TruffleString format, StructBuiltins.ConstructStructNode constructStructNode,
108108
@Cached("format") TruffleString cachedFormat,
109-
@Cached(inline = false) TruffleString.EqualNode eqNode,
109+
@Cached TruffleString.EqualNode eqNode,
110110
@Cached(value = "getStructInternal(module, format, constructStructNode)", weak = true) PStruct cachedStruct) {
111111
return cachedStruct;
112112
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ public abstract static class PyUnicodeBuildEncodingMapNode extends Node {
117117

118118
@Specialization
119119
static Object doIt(VirtualFrame frame, Node inliningTarget, TruffleString map,
120-
@Cached(inline = false) TruffleString.CodePointLengthNode codePointLengthNode,
121-
@Cached(inline = false) TruffleString.CodePointAtIndexNode codePointAtIndexNode,
120+
@Cached TruffleString.CodePointLengthNode codePointLengthNode,
121+
@Cached TruffleString.CodePointAtIndexNode codePointAtIndexNode,
122122
@Cached(inline = false) HashingStorageSetItem setItemNode,
123123
@Cached PRaiseNode raiseNode) {
124124
int len = Math.min(codePointLengthNode.execute(map, TS_ENCODING), 256);
@@ -203,8 +203,8 @@ static byte[] doLatin1(TruffleString src, TruffleString errors, PNone mapping,
203203

204204
@Fallback
205205
static byte[] doGenericMapping(VirtualFrame frame, Node inliningTarget, TruffleString src, TruffleString errors, Object mapping,
206-
@Cached(inline = false) TruffleString.CodePointLengthNode codePointLengthNode,
207-
@Cached(inline = false) TruffleString.CodePointAtIndexNode codePointAtIndexNode,
206+
@Cached TruffleString.CodePointLengthNode codePointLengthNode,
207+
@Cached TruffleString.CodePointAtIndexNode codePointAtIndexNode,
208208
@Cached CharmapEncodeOutputNode charmapEncodeOutputNode,
209209
@Cached CharmapEncodingErrorNode charmapEncodingErrorNode) {
210210
int len = codePointLengthNode.execute(src, TS_ENCODING);
@@ -236,8 +236,8 @@ abstract static class CharmapEncodingErrorNode extends Node {
236236
@Specialization
237237
static int doIt(VirtualFrame frame, Node inliningTarget, ErrorHandlerCache cache, TruffleString src, int pos, int len, TruffleString errors, Object mapping, ByteArrayBuilder builder,
238238
@Cached CastToTruffleStringNode castToTruffleStringNode,
239-
@Cached(inline = false) TruffleString.CodePointLengthNode codePointLengthNode,
240-
@Cached(inline = false) TruffleString.CodePointAtIndexNode codePointAtIndexNode,
239+
@Cached TruffleString.CodePointLengthNode codePointLengthNode,
240+
@Cached TruffleString.CodePointAtIndexNode codePointAtIndexNode,
241241
@Cached CharmapEncodeLookupNode charmapEncodeLookupNode,
242242
@Cached GetErrorHandlerNode getErrorHandlerNode,
243243
@Cached CallEncodingErrorHandlerNode callEncodingErrorHandlerNode,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public abstract static class GetErrorHandlerNode extends Node {
164164

165165
@Specialization
166166
static ErrorHandler doIt(Node inliningTarget, TruffleString errors,
167-
@Cached(inline = false) TruffleString.EqualNode equalNode,
167+
@Cached TruffleString.EqualNode equalNode,
168168
@Cached InlinedConditionProfile strictProfile,
169169
@Cached InlinedConditionProfile surrogateEscapeProfile,
170170
@Cached InlinedConditionProfile replaceProfile,
@@ -763,10 +763,10 @@ abstract static class GetStandardEncodingNode extends Node {
763763

764764
@Specialization
765765
StandardEncoding doIt(TruffleString encodingName,
766-
@Cached(inline = false) TruffleString.GetCodeRangeNode getCodeRangeNode,
767-
@Cached(inline = false) TruffleString.SwitchEncodingNode switchEncodingNode,
768-
@Cached(inline = false) TruffleString.CopyToByteArrayNode copyToByteArrayNode,
769-
@Cached(inline = false) TruffleString.EqualNode equalNode) {
766+
@Cached TruffleString.GetCodeRangeNode getCodeRangeNode,
767+
@Cached TruffleString.SwitchEncodingNode switchEncodingNode,
768+
@Cached TruffleString.CopyToByteArrayNode copyToByteArrayNode,
769+
@Cached TruffleString.EqualNode equalNode) {
770770
if (getCodeRangeNode.execute(encodingName, TS_ENCODING) != CodeRange.ASCII) {
771771
return StandardEncoding.UNKNOWN;
772772
}
@@ -962,7 +962,7 @@ static EncodingErrorHandlerResult doIt(VirtualFrame frame, Node inliningTarget,
962962
@Cached MakeEncodeExceptionNode makeEncodeExceptionNode,
963963
@Cached(inline = false) CallNode callNode,
964964
@Cached ParseEncodingErrorHandlerResultNode parseResultNode,
965-
@Cached(inline = false) TruffleString.CodePointLengthNode codePointLengthNode,
965+
@Cached TruffleString.CodePointLengthNode codePointLengthNode,
966966
@Cached PRaiseNode raiseNode) {
967967
cache.errorHandlerObject = cache.errorHandlerObject == null ? lookupErrorNode.execute(inliningTarget, errors) : cache.errorHandlerObject;
968968
int len = codePointLengthNode.execute(srcObj, TS_ENCODING);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ abstract static class ParamFuncNode extends Node {
168168
@Specialization
169169
static PyCArgObject paramFunc(CDataObject self, StgDictObject stgDict,
170170
@Bind PythonLanguage language,
171-
@Cached(inline = false) TruffleString.CodePointAtIndexNode codePointAtIndexNode) {
171+
@Cached TruffleString.CodePointAtIndexNode codePointAtIndexNode) {
172172
PyCArgObject parg = PFactory.createCArgObject(language);
173173
switch (stgDict.paramfunc) {
174174
// Corresponds to PyCArrayType_paramfunc

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -587,9 +587,9 @@ static void none(CDataObject target, int index, PNone keep) {
587587
@Specialization(guards = "!isNone(keep)")
588588
static void KeepRef(VirtualFrame frame, Node inliningTarget, CDataObject target, int index, Object keep,
589589
@Bind PythonLanguage language,
590-
@Cached(inline = false) TruffleStringBuilder.AppendStringNode appendStringNode,
591-
@Cached(inline = false) TruffleStringBuilder.ToStringNode toStringNode,
592-
@Cached(inline = false) TruffleString.FromJavaStringNode fromJavaStringNode,
590+
@Cached TruffleStringBuilder.AppendStringNode appendStringNode,
591+
@Cached TruffleStringBuilder.ToStringNode toStringNode,
592+
@Cached TruffleString.FromJavaStringNode fromJavaStringNode,
593593
@Cached HashingStorageSetItem setItem,
594594
@Cached PRaiseNode raiseNode) {
595595
CDataObject ob = PyCData_GetContainer(target, language);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1732,7 +1732,7 @@ static void fullcheck(Node inliningTarget, Object arg,
17321732
@Exclusive @Cached PyTypeCheck pyTypeCheck,
17331733
@Cached PyTypeStgDictNode pyTypeStgDictNode,
17341734
@Cached(inline = false) FailedCastCheckNode failedCastCheckNode,
1735-
@Cached(inline = false) TruffleString.CodePointAtIndexNode codePointAtIndexNode) {
1735+
@Cached TruffleString.CodePointAtIndexNode codePointAtIndexNode) {
17361736
if (isPtrTypeObject(inliningTarget, arg, pyTypeCheck)) {
17371737
return;
17381738
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ static void getBuffer(Node inliningTarget, CDataObject self, Object view, @Suppr
402402
@Cached GetClassNode getClassNode,
403403
@Cached PyObjectTypeCheck typeCheck,
404404
@Cached StgDictBuiltins.PyTypeStgDictNode stgDictNode,
405-
@Cached(inline = false) TruffleString.SwitchEncodingNode switchEncodingNode,
406-
@Cached(inline = false) TruffleString.GetInternalByteArrayNode getInternalByteArrayNode,
405+
@Cached TruffleString.SwitchEncodingNode switchEncodingNode,
406+
@Cached TruffleString.GetInternalByteArrayNode getInternalByteArrayNode,
407407
@Cached(inline = false) CStructAccess.AllocateNode allocateNode,
408408
@Cached(inline = false) CStructAccess.WriteByteNode writeByteNode,
409409
@Cached(inline = false) CStructAccess.WritePointerNode writePointerNode,

0 commit comments

Comments
 (0)