Skip to content

Commit f038ca4

Browse files
steve-ssteve-s
committed
[GR-38700] Uninline and make public lib nodes that will be needed in BytecodeDSL interpreter.
PullRequest: graalpython/3744
2 parents eedf8f0 + 6edacbf commit f038ca4

File tree

57 files changed

+1062
-523
lines changed

Some content is hidden

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

57 files changed

+1062
-523
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2083,9 +2083,8 @@ public abstract static class PowNode extends PythonTernaryBuiltinNode {
20832083

20842084
@Specialization
20852085
Object ternary(VirtualFrame frame, Object x, Object y, Object z,
2086-
@Bind("this") Node inliningTarget,
20872086
@Cached PyNumberPowerNode power) {
2088-
return power.execute(frame, inliningTarget, x, y, z);
2087+
return power.execute(frame, x, y, z);
20892088
}
20902089
}
20912090

@@ -2134,9 +2133,9 @@ static Object sumIntIterator(VirtualFrame frame, Node inliningTarget, PIntegerSe
21342133
longResult = PythonUtils.addExact(longResult, next);
21352134
} catch (OverflowException e) {
21362135
overflowProfile.enter(inliningTarget);
2137-
Object objectResult = addNode.execute(frame, inliningTarget, longResult, next);
2136+
Object objectResult = addNode.execute(frame, longResult, next);
21382137
while (loopProfileGeneric.profile(inliningTarget, iterator.hasNext())) {
2139-
objectResult = addNode.execute(frame, inliningTarget, objectResult, iterator.next());
2138+
objectResult = addNode.execute(frame, objectResult, iterator.next());
21402139
}
21412140
return objectResult;
21422141
}
@@ -2158,9 +2157,9 @@ static Object sumLongIterator(VirtualFrame frame, Node inliningTarget, PLongSequ
21582157
longResult = PythonUtils.addExact(longResult, next);
21592158
} catch (OverflowException e) {
21602159
overflowProfile.enter(inliningTarget);
2161-
Object objectResult = addNode.execute(frame, inliningTarget, longResult, next);
2160+
Object objectResult = addNode.execute(frame, longResult, next);
21622161
while (loopProfileGeneric.profile(inliningTarget, iterator.hasNext())) {
2163-
objectResult = addNode.execute(frame, inliningTarget, objectResult, iterator.next());
2162+
objectResult = addNode.execute(frame, objectResult, iterator.next());
21642163
}
21652164
return objectResult;
21662165
}
@@ -2205,7 +2204,7 @@ static Object sumGeneric(VirtualFrame frame, Node inliningTarget, Object iterato
22052204
} catch (IteratorExhausted e) {
22062205
return start;
22072206
}
2208-
Object acc = addNode.execute(frame, inliningTarget, start, next);
2207+
Object acc = addNode.execute(frame, start, next);
22092208
/*
22102209
* We try to process integers/longs/doubles as long as we can. Then we always fall
22112210
* through to the generic path. `next` and `acc` are always properly set so that the
@@ -2268,7 +2267,7 @@ static Object sumGeneric(VirtualFrame frame, Node inliningTarget, Object iterato
22682267
}
22692268
boolean exhausted = false;
22702269
do {
2271-
acc = addNode.execute(frame, inliningTarget, acc, next);
2270+
acc = addNode.execute(frame, acc, next);
22722271
try {
22732272
next = nextNode.execute(frame, inliningTarget, iterator);
22742273
} catch (IteratorExhausted e) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2496,7 +2496,7 @@ public Object doGeneric(VirtualFrame frame, Object iterable, Object startIn,
24962496
while (loopProfile.profile(inliningTarget, !exhausted)) {
24972497
try {
24982498
Object next = nextNode.execute(frame, inliningTarget, iterator);
2499-
acc = multiplyNode.execute(frame, inliningTarget, acc, next);
2499+
acc = multiplyNode.execute(frame, acc, next);
25002500
} catch (IteratorExhausted e) {
25012501
exhausted = true;
25022502
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,8 @@ static Object doObject(VirtualFrame frame, Object left, Object right,
133133
abstract static class MulNode extends PythonBinaryBuiltinNode {
134134
@Specialization
135135
static Object doObject(VirtualFrame frame, Object left, Object right,
136-
@Bind("this") Node inliningTarget,
137136
@Cached PyNumberMultiplyNode mulNode) {
138-
return mulNode.execute(frame, inliningTarget, left, right);
137+
return mulNode.execute(frame, left, right);
139138
}
140139
}
141140

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,8 @@ abstract static class PyTrufflePyNumber_Add extends CApiBinaryBuiltinNode {
266266

267267
@Specialization
268268
static Object doGeneric(Object o1, Object o2,
269-
@Bind Node inliningTarget,
270269
@Cached PyNumberAddNode addNode) {
271-
return addNode.execute(null, inliningTarget, o1, o2);
270+
return addNode.execute(null, o1, o2);
272271
}
273272
}
274273

@@ -287,9 +286,8 @@ abstract static class PyTrufflePyNumber_Multiply extends CApiBinaryBuiltinNode {
287286

288287
@Specialization
289288
static Object doGeneric(Object o1, Object o2,
290-
@Bind Node inliningTarget,
291289
@Cached PyNumberMultiplyNode multiplyNode) {
292-
return multiplyNode.execute(null, inliningTarget, o1, o2);
290+
return multiplyNode.execute(null, o1, o2);
293291
}
294292
}
295293

@@ -528,9 +526,8 @@ abstract static class PyTrufflePyNumber_Power extends CApiTernaryBuiltinNode {
528526

529527
@Specialization
530528
Object doGeneric(Object o1, Object o2, Object o3,
531-
@Bind("this") Node inliningTarget,
532529
@Cached PyNumberPowerNode powerNode) {
533-
return powerNode.execute(null, inliningTarget, o1, o2, o3);
530+
return powerNode.execute(null, o1, o2, o3);
534531
}
535532
}
536533

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/GetAwaitableNode.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
import com.oracle.truffle.api.dsl.GenerateUncached;
5858
import com.oracle.truffle.api.dsl.ImportStatic;
5959
import com.oracle.truffle.api.dsl.Specialization;
60-
import com.oracle.truffle.api.frame.Frame;
60+
import com.oracle.truffle.api.frame.VirtualFrame;
6161
import com.oracle.truffle.api.nodes.Node;
6262

6363
@GenerateUncached
6464
@ImportStatic(SpecialMethodSlot.class)
6565
@SuppressWarnings("truffle-inlining")
6666
public abstract class GetAwaitableNode extends Node {
67-
public abstract Object execute(Frame frame, Object arg);
67+
public abstract Object execute(VirtualFrame frame, Object arg);
6868

6969
@Specialization
7070
public static Object doGenerator(PGenerator generator,
@@ -83,7 +83,7 @@ public static Object doGenerator(PGenerator generator,
8383
}
8484

8585
@Specialization
86-
public static Object doGeneric(Frame frame, Object awaitable,
86+
public static Object doGeneric(VirtualFrame frame, Object awaitable,
8787
@Bind("this") Node inliningTarget,
8888
@Exclusive @Cached PRaiseNode raiseNoAwait,
8989
@Exclusive @Cached PRaiseNode raiseNotIter,

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -890,9 +890,8 @@ public abstract static class GraalHPyAdd extends HPyTernaryContextFunction {
890890

891891
@Specialization
892892
static Object doGeneric(@SuppressWarnings("unused") Object hpyContext, Object arg0, Object arg1,
893-
@Bind Node inliningTarget,
894893
@Cached PyNumberAddNode arithmeticNode) {
895-
return arithmeticNode.execute(null, inliningTarget, arg0, arg1);
894+
return arithmeticNode.execute(null, arg0, arg1);
896895
}
897896
}
898897

@@ -913,9 +912,8 @@ public abstract static class GraalHPyMultiply extends HPyTernaryContextFunction
913912

914913
@Specialization
915914
static Object doGeneric(@SuppressWarnings("unused") Object hpyContext, Object arg0, Object arg1,
916-
@Bind Node inliningTarget,
917915
@Cached PyNumberMultiplyNode arithmeticNode) {
918-
return arithmeticNode.execute(null, inliningTarget, arg0, arg1);
916+
return arithmeticNode.execute(null, arg0, arg1);
919917
}
920918
}
921919

@@ -1035,9 +1033,8 @@ public abstract static class GraalHPyPower extends HPyQuaternaryContextFunction
10351033

10361034
@Specialization
10371035
static Object doGeneric(@SuppressWarnings("unused") Object hpyContext, Object arg0, Object arg1, Object arg2,
1038-
@Bind("this") Node inliningTarget,
10391036
@Cached PyNumberPowerNode powerNode) {
1040-
return powerNode.execute(null, inliningTarget, arg0, arg1, arg2);
1037+
return powerNode.execute(null, arg0, arg1, arg2);
10411038
}
10421039
}
10431040

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ static double doDD(VirtualFrame frame, double left, double right, @SuppressWarni
392392
CompilerDirectives.transferToInterpreterAndInvalidate();
393393
// Negative numbers raised to fractional powers become complex.
394394
PythonLanguage language = PythonLanguage.get(inliningTarget);
395-
throw new UnexpectedResultException(powerNode.execute(frame, inliningTarget, PFactory.createComplex(language, left, 0), PFactory.createComplex(language, right, 0), none));
395+
throw new UnexpectedResultException(powerNode.execute(frame, PFactory.createComplex(language, left, 0), PFactory.createComplex(language, right, 0), none));
396396
}
397397
return Math.pow(left, right);
398398
}
@@ -409,7 +409,7 @@ static Object doDDToComplex(VirtualFrame frame, double left, double right, PNone
409409
if (left < 0 && Double.isFinite(left) && Double.isFinite(right) && (right % 1 != 0)) {
410410
// Negative numbers raised to fractional powers become complex.
411411
PythonLanguage language = PythonLanguage.get(inliningTarget);
412-
return powerNode.execute(frame, inliningTarget, PFactory.createComplex(language, left, 0), PFactory.createComplex(language, right, 0), none);
412+
return powerNode.execute(frame, PFactory.createComplex(language, left, 0), PFactory.createComplex(language, right, 0), none);
413413
}
414414
return Math.pow(left, right);
415415
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignNumberBuiltins.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ static Object doIt(VirtualFrame frame, Object v, Object w, Object z,
596596
if (v == null || w == null || z == null) {
597597
return PNotImplemented.NOT_IMPLEMENTED;
598598
}
599-
return power.execute(frame, inliningTarget, v, w, z);
599+
return power.execute(frame, v, w, z);
600600
}
601601
}
602602

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/AccumulateBuiltins.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static Object next(VirtualFrame frame, PAccumulate self,
123123
return value;
124124
}
125125
if (hasFuncProfile.profile(inliningTarget, self.getFunc() == null)) {
126-
self.setTotal(addNode.execute(frame, inliningTarget, self.getTotal(), value));
126+
self.setTotal(addNode.execute(frame, self.getTotal(), value));
127127
} else {
128128
self.setTotal(callNode.execute(frame, self.getFunc(), self.getTotal(), value));
129129
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/CountBuiltins.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,9 @@ static Object iter(PCount self) {
101101
public abstract static class NextNode extends TpIterNextBuiltin {
102102
@Specialization
103103
static Object next(VirtualFrame frame, PCount self,
104-
@Bind("this") Node inliningTarget,
105104
@Cached PyNumberAddNode addNode) {
106105
Object cnt = self.getCnt();
107-
self.setCnt(addNode.execute(frame, inliningTarget, self.getCnt(), self.getStep()));
106+
self.setCnt(addNode.execute(frame, self.getCnt(), self.getStep()));
108107
return cnt;
109108
}
110109
}

0 commit comments

Comments
 (0)