Skip to content

Commit c517f22

Browse files
committed
remove reversible flag for CallBinaryMethodNode since now we're inlining these calls everywhere
1 parent fbb905f commit c517f22

File tree

5 files changed

+6
-25
lines changed

5 files changed

+6
-25
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallBinaryMethodNode.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@
5959
@ReportPolymorphism
6060
public abstract class CallBinaryMethodNode extends CallReversibleMethodNode {
6161
public static CallBinaryMethodNode create() {
62-
return CallBinaryMethodNodeGen.create(false);
63-
}
64-
65-
static CallBinaryMethodNode createReversed() {
66-
return CallBinaryMethodNodeGen.create(true);
62+
return CallBinaryMethodNodeGen.create();
6763
}
6864

6965
public static CallBinaryMethodNode getUncached() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallReversibleMethodNode.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,10 @@
4343
import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
4444
import com.oracle.truffle.api.CompilerAsserts;
4545
import com.oracle.truffle.api.RootCallTarget;
46-
import com.oracle.truffle.api.dsl.NodeField;
4746

48-
@NodeField(name = "forReverseBinaryOperation", type = boolean.class)
4947
abstract class CallReversibleMethodNode extends CallSpecialMethodNode {
50-
protected abstract boolean isForReverseBinaryOperation();
51-
52-
protected boolean isForReverseBinaryOperation(PBuiltinFunction func) {
53-
boolean isReverseOperationSlot = func.isReverseOperationSlot();
54-
CompilerAsserts.partialEvaluationConstant(isReverseOperationSlot);
55-
return isForReverseBinaryOperation() && isReverseOperationSlot;
56-
}
57-
5848
protected boolean isForReverseBinaryOperation(RootCallTarget ct) {
59-
boolean isReverseOperationSlot = PBuiltinFunction.isReverseOperationSlot(ct);
60-
CompilerAsserts.partialEvaluationConstant(isReverseOperationSlot);
61-
return isForReverseBinaryOperation() && isReverseOperationSlot;
49+
CompilerAsserts.neverPartOfCompilation();
50+
return PBuiltinFunction.isReverseOperationSlot(ct);
6251
}
6352
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallTernaryMethodNode.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@
5858
@GenerateUncached
5959
public abstract class CallTernaryMethodNode extends CallReversibleMethodNode {
6060
public static CallTernaryMethodNode create() {
61-
return CallTernaryMethodNodeGen.create(false);
62-
}
63-
64-
static CallTernaryMethodNode createReversed() {
65-
return CallTernaryMethodNodeGen.create(true);
61+
return CallTernaryMethodNodeGen.create();
6662
}
6763

6864
public static CallTernaryMethodNode getUncached() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private CallBinaryMethodNode ensureReverseDispatch() {
147147
// this also serves as a branch profile
148148
if (reverseDispatchNode == null) {
149149
CompilerDirectives.transferToInterpreterAndInvalidate();
150-
reverseDispatchNode = insert(CallBinaryMethodNode.createReversed());
150+
reverseDispatchNode = insert(CallBinaryMethodNode.create());
151151
}
152152
return reverseDispatchNode;
153153
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallTernaryNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private CallTernaryMethodNode ensureReverseDispatch() {
125125
// this also serves as a branch profile
126126
if (reverseDispatchNode == null) {
127127
CompilerDirectives.transferToInterpreterAndInvalidate();
128-
reverseDispatchNode = insert(CallTernaryMethodNode.createReversed());
128+
reverseDispatchNode = insert(CallTernaryMethodNode.create());
129129
}
130130
return reverseDispatchNode;
131131
}

0 commit comments

Comments
 (0)