Skip to content

Commit 87c7203

Browse files
committed
do not ever call PDecoratedMethod directly from a call node
1 parent 7e67b2f commit 87c7203

File tree

1 file changed

+1
-8
lines changed
  • graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call

1 file changed

+1
-8
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/CallNode.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import com.oracle.graal.python.builtins.objects.function.PFunction;
4747
import com.oracle.graal.python.builtins.objects.function.PKeyword;
4848
import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
49-
import com.oracle.graal.python.builtins.objects.method.PDecoratedMethod;
5049
import com.oracle.graal.python.builtins.objects.method.PMethod;
5150
import com.oracle.graal.python.nodes.ErrorMessages;
5251
import com.oracle.graal.python.nodes.PGuards;
@@ -129,12 +128,6 @@ private static Object callCall(VirtualFrame frame, Object callableObject, Object
129128
return callCallNode.execute(frame, call, PositionalArgumentsNode.prependArgument(callableObject, arguments), keywords);
130129
}
131130

132-
@Specialization
133-
protected Object decoratedMethodCall(VirtualFrame frame, PDecoratedMethod callable, Object[] arguments, PKeyword[] keywords,
134-
@Cached CallNode recursive) {
135-
return recursive.execute(frame, callable.getCallable(), arguments, keywords);
136-
}
137-
138131
@Specialization(guards = "isPBuiltinFunction(callable.getFunction())")
139132
protected Object methodCallBuiltinDirect(VirtualFrame frame, PMethod callable, Object[] arguments, PKeyword[] keywords,
140133
@Shared("dispatchNode") @Cached CallDispatchNode dispatch,
@@ -200,7 +193,7 @@ protected Object builtinFunctionCall(VirtualFrame frame, PBuiltinFunction callab
200193
return dispatch.executeCall(frame, callable, createArgs.execute(callable, arguments, keywords));
201194
}
202195

203-
@Specialization(replaces = {"doObjectAndType", "decoratedMethodCall", "methodCallBuiltinDirect", "methodCallDirect", "builtinMethodCallBuiltinDirectCached",
196+
@Specialization(replaces = {"doObjectAndType", "methodCallBuiltinDirect", "methodCallDirect", "builtinMethodCallBuiltinDirectCached",
204197
"builtinMethodCallBuiltinDirect", "methodCall", "builtinMethodCall", "functionCall", "builtinFunctionCall"})
205198
protected Object doGeneric(VirtualFrame frame, Object callableObject, Object[] arguments, PKeyword[] keywords,
206199
@Shared("dispatchNode") @Cached CallDispatchNode dispatch,

0 commit comments

Comments
 (0)