Skip to content

Commit d9117cb

Browse files
committed
remove indirection through PythonTernaryBuiltinNode.call
1 parent 67856e1 commit d9117cb

19 files changed

+53
-54
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@ abstract static class UTF8EncodeNode extends PythonBinaryBuiltinNode {
10791079
@Specialization
10801080
Object encode(VirtualFrame frame, Object obj, Object errors,
10811081
@Cached CodecsEncodeNode encode) {
1082-
return encode.call(frame, obj, "utf-8", errors);
1082+
return encode.execute(frame, obj, "utf-8", errors);
10831083
}
10841084
}
10851085

@@ -1099,7 +1099,7 @@ abstract static class UTF7EncodeNode extends PythonBinaryBuiltinNode {
10991099
@Specialization
11001100
Object encode(VirtualFrame frame, Object obj, Object errors,
11011101
@Cached CodecsEncodeNode encode) {
1102-
return encode.call(frame, obj, "utf-7", errors);
1102+
return encode.execute(frame, obj, "utf-7", errors);
11031103
}
11041104
}
11051105

@@ -1119,7 +1119,7 @@ abstract static class UTF16EncodeNode extends PythonTernaryBuiltinNode {
11191119
@Specialization
11201120
Object encode(VirtualFrame frame, Object obj, Object errors, @SuppressWarnings("unused") Object byteorder,
11211121
@Cached CodecsEncodeNode encode) {
1122-
return encode.call(frame, obj, "utf-16", errors);
1122+
return encode.execute(frame, obj, "utf-16", errors);
11231123
}
11241124
}
11251125

@@ -1139,7 +1139,7 @@ abstract static class UTF16LEEncodeNode extends PythonBinaryBuiltinNode {
11391139
@Specialization
11401140
Object encode(VirtualFrame frame, Object obj, Object errors,
11411141
@Cached CodecsEncodeNode encode) {
1142-
return encode.call(frame, obj, "utf-16-le", errors);
1142+
return encode.execute(frame, obj, "utf-16-le", errors);
11431143
}
11441144
}
11451145

@@ -1159,7 +1159,7 @@ abstract static class UTF16BEEncodeNode extends PythonBinaryBuiltinNode {
11591159
@Specialization
11601160
Object encode(VirtualFrame frame, Object obj, Object errors,
11611161
@Cached CodecsEncodeNode encode) {
1162-
return encode.call(frame, obj, "utf-16-be", errors);
1162+
return encode.execute(frame, obj, "utf-16-be", errors);
11631163
}
11641164
}
11651165

@@ -1189,7 +1189,7 @@ abstract static class UTF32EncodeNode extends PythonTernaryBuiltinNode {
11891189
@Specialization
11901190
Object encode(VirtualFrame frame, Object obj, Object errors, @SuppressWarnings("unused") Object byteorder,
11911191
@Cached CodecsEncodeNode encode) {
1192-
return encode.call(frame, obj, "utf-32", errors);
1192+
return encode.execute(frame, obj, "utf-32", errors);
11931193
}
11941194
}
11951195

@@ -1209,7 +1209,7 @@ abstract static class UTF32LEEncodeNode extends PythonBinaryBuiltinNode {
12091209
@Specialization
12101210
Object encode(VirtualFrame frame, Object obj, Object errors,
12111211
@Cached CodecsEncodeNode encode) {
1212-
return encode.call(frame, obj, "utf-32-le", errors);
1212+
return encode.execute(frame, obj, "utf-32-le", errors);
12131213
}
12141214
}
12151215

@@ -1229,7 +1229,7 @@ abstract static class UTF32BEEncodeNode extends PythonBinaryBuiltinNode {
12291229
@Specialization
12301230
Object encode(VirtualFrame frame, Object obj, Object errors,
12311231
@Cached CodecsEncodeNode encode) {
1232-
return encode.call(frame, obj, "utf-32-be", errors);
1232+
return encode.execute(frame, obj, "utf-32-be", errors);
12331233
}
12341234
}
12351235

@@ -1279,7 +1279,7 @@ abstract static class RawUnicodeEscapeEncodeNode extends PythonBinaryBuiltinNode
12791279
@Specialization
12801280
Object encode(VirtualFrame frame, Object obj, Object errors,
12811281
@Cached CodecsEncodeNode encode) {
1282-
return encode.call(frame, obj, "raw_unicode_escape", errors);
1282+
return encode.execute(frame, obj, "raw_unicode_escape", errors);
12831283
}
12841284
}
12851285

@@ -1299,7 +1299,7 @@ abstract static class UnicodeEscapeEncodeNode extends PythonBinaryBuiltinNode {
12991299
@Specialization
13001300
Object encode(VirtualFrame frame, Object obj, Object errors,
13011301
@Cached CodecsEncodeNode encode) {
1302-
return encode.call(frame, obj, "unicode_escape", errors);
1302+
return encode.execute(frame, obj, "unicode_escape", errors);
13031303
}
13041304
}
13051305

@@ -1319,7 +1319,7 @@ abstract static class Latin1EscapeEncodeNode extends PythonBinaryBuiltinNode {
13191319
@Specialization
13201320
Object encode(VirtualFrame frame, Object obj, Object errors,
13211321
@Cached CodecsEncodeNode encode) {
1322-
return encode.call(frame, obj, "latin_1", errors);
1322+
return encode.execute(frame, obj, "latin_1", errors);
13231323
}
13241324
}
13251325

@@ -1339,7 +1339,7 @@ abstract static class AsciiEscapeEncodeNode extends PythonBinaryBuiltinNode {
13391339
@Specialization
13401340
Object encode(VirtualFrame frame, Object obj, Object errors,
13411341
@Cached CodecsEncodeNode encode) {
1342-
return encode.call(frame, obj, "ascii", errors);
1342+
return encode.execute(frame, obj, "ascii", errors);
13431343
}
13441344
}
13451345

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ protected abstract static class EncodeNode extends PythonTernaryBuiltinNode {
358358
Object encode(VirtualFrame frame, PythonObject self, Object input, Object errors,
359359
@Cached PyObjectGetAttr getAttrNode,
360360
@Cached CodecsEncodeNode encode) {
361-
return encode.call(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors);
361+
return encode.execute(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors);
362362
}
363363
}
364364

@@ -381,7 +381,7 @@ Object encode(VirtualFrame frame, PythonObject self, Object input, @SuppressWarn
381381
@Cached PyObjectGetAttr getAttrNode,
382382
@Cached CodecsEncodeNode encode,
383383
@Cached TupleBuiltins.GetItemNode getItemNode) {
384-
PTuple result = (PTuple) encode.call(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), getAttrNode.execute(frame, self, ATTR_ERRORS));
384+
PTuple result = (PTuple) encode.execute(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), getAttrNode.execute(frame, self, ATTR_ERRORS));
385385
return getItemNode.execute(frame, result, 0);
386386
}
387387
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public abstract static class StatResultNode extends PythonTernaryBuiltinNode {
293293
@Specialization
294294
public static PTuple generic(VirtualFrame frame, Object cls, Object sequence, Object dict,
295295
@Cached("create(STAT_RESULT_DESC)") StructSequence.NewNode newNode) {
296-
PTuple p = (PTuple) newNode.call(frame, cls, sequence, dict);
296+
PTuple p = (PTuple) newNode.execute(frame, cls, sequence, dict);
297297
Object[] data = CompilerDirectives.castExact(p.getSequenceStorage(), ObjectSequenceStorage.class).getInternalArray();
298298
for (int i = 7; i <= 9; i++) {
299299
if (data[i + 3] == PNone.NONE) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3436,7 +3436,7 @@ Object classMethod(VirtualFrame frame, @SuppressWarnings("unused") Object primar
34363436
@Cached DictBuiltins.SetItemNode setItemNode) {
34373437
Object func = newClassMethodNode.execute(name, cfunc, flags, wrapper, owner, doc, factory());
34383438
Object dict = asPythonObjectNode.execute(tpDict);
3439-
setItemNode.call(frame, dict, name, func);
3439+
setItemNode.execute(frame, dict, name, func);
34403440
return 0;
34413441
}
34423442

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ public abstract static class TellNode extends PythonUnaryBuiltinNode {
766766
@Specialization
767767
static Object tell(VirtualFrame frame, PFileIO self,
768768
@Cached SeekNode seekNode) {
769-
return seekNode.call(frame, self, 0, SEEK_CUR);
769+
return seekNode.execute(frame, self, 0, SEEK_CUR);
770770
}
771771

772772
public static long internalTell(PFileIO self,
@@ -805,7 +805,7 @@ static Object num(VirtualFrame frame, PFileIO self, Object posobj,
805805
static Object none(VirtualFrame frame, PFileIO self, @SuppressWarnings("unused") PNone posobj,
806806
@Shared("ft") @Cached PosixModuleBuiltins.FtruncateNode posixTruncate,
807807
@Cached PosixModuleBuiltins.LseekNode posixSeek) {
808-
Object pos = posixSeek.call(frame, self.getFD(), 0, SEEK_CUR);
808+
Object pos = posixSeek.execute(frame, self.getFD(), 0, SEEK_CUR);
809809
posixTruncate.execute(frame, self.getFD(), pos);
810810
return pos;
811811
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/StringIOBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static void writeString(VirtualFrame frame, PStringIO self, String obj,
172172
String decoded;
173173
if (self.getDecoder() != null) {
174174
// (mq) IncrementalNewlineDecoderBuiltins.DecodeNode always returns a String
175-
decoded = (String) decodeNode.call(frame, self.getDecoder(), obj, true /*- always final */);
175+
decoded = (String) decodeNode.execute(frame, self.getDecoder(), obj, true /*- always final */);
176176
} else {
177177
decoded = obj;
178178
}
@@ -578,7 +578,7 @@ Object doit(VirtualFrame frame, PStringIO self, PTuple state,
578578
if (array.length < 4) {
579579
return notTuple(self, state);
580580
}
581-
initNode.call(frame, self, array[0], array[1]);
581+
initNode.execute(frame, self, array[0], array[1]);
582582
/*
583583
* Restore the buffer state. Even if __init__ did initialize the buffer, we have to
584584
* initialize it again since __init__ may translate the newlines in the initial_value

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,9 +1785,6 @@ abstract static class AbstractSplitNode extends PythonTernaryClinicBuiltinNode {
17851785

17861786
protected static final byte[] WHITESPACE = new byte[]{' '};
17871787

1788-
@Override
1789-
public abstract PList execute(VirtualFrame frame, Object bytes, Object sep, Object maxsplit);
1790-
17911788
@Override
17921789
protected ArgumentClinicProvider getArgumentClinic() {
17931790
CompilerAsserts.neverPartOfCompilation();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2177,7 +2177,7 @@ Object upcall0(VirtualFrame frame, Object[] args,
21772177
@Shared("getAttrNode") @Cached GetAttrNode getAttrNode) {
21782178
Object receiver = receiverToJavaNode.execute(args[0]);
21792179
assert PGuards.isString(args[1]);
2180-
Object callable = getAttrNode.call(frame, receiver, args[1], PNone.NO_VALUE);
2180+
Object callable = getAttrNode.execute(frame, receiver, args[1], PNone.NO_VALUE);
21812181
return callNode.execute(frame, callable, PythonUtils.EMPTY_OBJECT_ARRAY, PKeyword.EMPTY_KEYWORDS);
21822182
}
21832183

@@ -2189,7 +2189,7 @@ Object upcall1(VirtualFrame frame, Object[] args,
21892189
@Shared("getAttrNode") @Cached GetAttrNode getAttrNode) {
21902190
Object receiver = receiverToJavaNode.execute(args[0]);
21912191
assert PGuards.isString(args[1]);
2192-
Object callable = getAttrNode.call(frame, receiver, args[1], PNone.NO_VALUE);
2192+
Object callable = getAttrNode.execute(frame, receiver, args[1], PNone.NO_VALUE);
21932193
return callNode.executeObject(frame, callable, argToJavaNode.execute(args[2]));
21942194
}
21952195

@@ -2202,7 +2202,7 @@ Object upcall2(VirtualFrame frame, Object[] args,
22022202
Object[] converted = allToJavaNode.execute(args, 2);
22032203
Object receiver = receiverToJavaNode.execute(args[0]);
22042204
assert PGuards.isString(args[1]);
2205-
Object callable = getAttrNode.call(frame, receiver, args[1], PNone.NO_VALUE);
2205+
Object callable = getAttrNode.execute(frame, receiver, args[1], PNone.NO_VALUE);
22062206
return callNode.executeObject(frame, callable, converted[0], converted[1]);
22072207
}
22082208

@@ -2215,7 +2215,7 @@ Object upcall3(VirtualFrame frame, Object[] args,
22152215
Object[] converted = allToJavaNode.execute(args, 2);
22162216
Object receiver = receiverToJavaNode.execute(args[0]);
22172217
assert PGuards.isString(args[1]);
2218-
Object callable = getAttrNode.call(frame, receiver, args[1], PNone.NO_VALUE);
2218+
Object callable = getAttrNode.execute(frame, receiver, args[1], PNone.NO_VALUE);
22192219
return callNode.execute(frame, callable, converted[0], converted[1], converted[2]);
22202220
}
22212221

@@ -2230,7 +2230,7 @@ Object upcall(VirtualFrame frame, Object[] args,
22302230
Object[] converted = allToJavaNode.execute(args, 2);
22312231
Object receiver = receiverToJavaNode.execute(args[0]);
22322232
assert PGuards.isString(args[1]);
2233-
Object callable = getAttrNode.call(frame, receiver, args[1], PNone.NO_VALUE);
2233+
Object callable = getAttrNode.execute(frame, receiver, args[1], PNone.NO_VALUE);
22342234
return callNode.execute(frame, callable, converted, PKeyword.EMPTY_KEYWORDS);
22352235
}
22362236
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ static void doPMMapGeneric(VirtualFrame frame, PMemoryView self, @SuppressWarnin
445445
byte[] bytes = new byte[itemSize];
446446
packValueNode.execute(frame, self.getFormat(), self.getFormatString(), object, bytes, 0);
447447
for (int i = 0; i < itemSize; i++) {
448-
setItemNode.call(frame, self.getOwner(), offset + i, bytes[i]);
448+
setItemNode.execute(frame, self.getOwner(), offset + i, bytes[i]);
449449
}
450450
}
451451

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1824,7 +1824,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
18241824
Object doStringEncoding(VirtualFrame frame, String self, String encoding, String errors,
18251825
@Cached CodecsModuleBuiltins.EncodeNode encodeNode,
18261826
@Cached SequenceStorageNodes.CopyNode copyNode) {
1827-
Object result = encodeNode.call(frame, self, encoding, errors);
1827+
Object result = encodeNode.execute(frame, self, encoding, errors);
18281828
if (!(result instanceof PBytes)) {
18291829
if (result instanceof PByteArray) {
18301830
return factory().createBytes(copyNode.execute(((PByteArray) result).getSequenceStorage()));

0 commit comments

Comments
 (0)