Skip to content

Commit 158fdc1

Browse files
committed
disambiguate Ternary builtin execute methods
1 parent 0300452 commit 158fdc1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static CallTernaryMethodNode create() {
6262
Object call(@SuppressWarnings("unused") PBuiltinFunction func, Object arg1, int arg2, Object arg3,
6363
@SuppressWarnings("unused") @Cached("func") PBuiltinFunction cachedFunc,
6464
@Cached("getTernary(func)") PythonTernaryBuiltinNode builtinNode) {
65-
return builtinNode.execute(arg1, arg2, arg3);
65+
return builtinNode.executeWithInt(arg1, arg2, arg3);
6666
}
6767

6868
@Specialization(guards = {"func == cachedFunc", "builtinNode != null"}, limit = "getCallSiteInlineCacheMaxDepth()")
@@ -76,7 +76,7 @@ Object call(@SuppressWarnings("unused") PBuiltinFunction func, Object arg1, Obje
7676
Object call(@SuppressWarnings("unused") PBuiltinFunction func, Object arg1, int arg2, Object arg3,
7777
@SuppressWarnings("unused") @Cached("func.getCallTarget()") RootCallTarget ct,
7878
@Cached("getTernary(func)") PythonTernaryBuiltinNode builtinNode) {
79-
return builtinNode.execute(arg1, arg2, arg3);
79+
return builtinNode.executeWithInt(arg1, arg2, arg3);
8080
}
8181

8282
@Specialization(guards = {"func.getCallTarget() == ct", "builtinNode != null"}, limit = "getCallSiteInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")
@@ -90,7 +90,7 @@ Object call(@SuppressWarnings("unused") PBuiltinFunction func, Object arg1, Obje
9090
Object call(@SuppressWarnings("unused") PBuiltinMethod func, Object arg1, int arg2, Object arg3,
9191
@SuppressWarnings("unused") @Cached("func") PBuiltinMethod cachedFunc,
9292
@Cached("getTernary(func.getFunction())") PythonTernaryBuiltinNode builtinNode) {
93-
return builtinNode.execute(arg1, arg2, arg3);
93+
return builtinNode.executeWithInt(arg1, arg2, arg3);
9494
}
9595

9696
@Specialization(guards = {"func == cachedFunc", "builtinNode != null"}, limit = "getCallSiteInlineCacheMaxDepth()")
@@ -104,7 +104,7 @@ Object call(@SuppressWarnings("unused") PBuiltinMethod func, Object arg1, Object
104104
Object call(@SuppressWarnings("unused") PBuiltinMethod func, Object arg1, int arg2, Object arg3,
105105
@SuppressWarnings("unused") @Cached("getCallTarget(func)") RootCallTarget ct,
106106
@Cached("getTernary(func.getFunction())") PythonTernaryBuiltinNode builtinNode) {
107-
return builtinNode.execute(arg1, arg2, arg3);
107+
return builtinNode.executeWithInt(arg1, arg2, arg3);
108108
}
109109

110110
@Specialization(guards = {"builtinNode != null", "getCallTarget(func) == ct"}, limit = "getCallSiteInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonTernaryBuiltinNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
4444

4545
public abstract class PythonTernaryBuiltinNode extends PythonBuiltinBaseNode {
46-
public abstract Object execute(Object arg, int arg2, Object arg3);
46+
public abstract Object executeWithInt(Object arg, int arg2, Object arg3);
4747

4848
public abstract Object execute(Object arg, Object arg2, Object arg3);
4949
}

0 commit comments

Comments
 (0)