Skip to content

Commit 9dc0318

Browse files
committed
Fix PInt.asIndex
1 parent 4e65b2b commit 9dc0318

File tree

1 file changed

+3
-20
lines changed
  • graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints

1 file changed

+3
-20
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,12 @@
3232
import com.oracle.graal.python.PythonLanguage;
3333
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
3434
import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
35-
import com.oracle.graal.python.builtins.modules.WarningsModuleBuiltins.WarnNode;
3635
import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapperLibrary;
37-
import com.oracle.graal.python.builtins.objects.function.PArguments;
3836
import com.oracle.graal.python.builtins.objects.function.PArguments.ThreadState;
3937
import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
4038
import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
4139
import com.oracle.graal.python.nodes.ErrorMessages;
4240
import com.oracle.graal.python.nodes.PRaiseNode;
43-
import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
4441
import com.oracle.graal.python.nodes.util.CastToJavaDoubleNode;
4542
import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;
4643
import com.oracle.graal.python.nodes.util.CastToJavaLongExactNode;
@@ -54,7 +51,6 @@
5451
import com.oracle.truffle.api.dsl.Cached.Exclusive;
5552
import com.oracle.truffle.api.dsl.Cached.Shared;
5653
import com.oracle.truffle.api.dsl.CachedContext;
57-
import com.oracle.truffle.api.frame.VirtualFrame;
5854
import com.oracle.truffle.api.interop.InteropLibrary;
5955
import com.oracle.truffle.api.interop.UnsupportedMessageException;
6056
import com.oracle.truffle.api.library.CachedLibrary;
@@ -231,19 +227,7 @@ public boolean canBeIndex() {
231227
}
232228

233229
@ExportMessage
234-
public Object asIndexWithState(@SuppressWarnings("unused") ThreadState threadState,
235-
@Cached ConditionProfile gotState,
236-
@Cached IsBuiltinClassProfile isInt,
237-
@Cached WarnNode warnNode) {
238-
if (!isInt.profileObject(this, PythonBuiltinClassType.PInt)) {
239-
VirtualFrame frame = null;
240-
if (gotState.profile(threadState != null)) {
241-
frame = PArguments.frameForCall(threadState);
242-
}
243-
warnNode.warnFormat(frame, null, PythonBuiltinClassType.DeprecationWarning, 1,
244-
ErrorMessages.P_RETURNED_NON_P,
245-
this, "__index__", "int", this, "int");
246-
}
230+
public Object asIndexWithState(@SuppressWarnings("unused") ThreadState threadState) {
247231
return this;
248232
}
249233

@@ -275,10 +259,9 @@ public boolean canBeJavaDouble() {
275259
}
276260

277261
@ExportMessage
278-
public double asJavaDoubleWithState(ThreadState threadState,
279-
@CachedLibrary("this") PythonObjectLibrary lib,
262+
public double asJavaDoubleWithState(@SuppressWarnings("unused") ThreadState threadState,
280263
@Cached CastToJavaDoubleNode castToDouble) {
281-
return castToDouble.execute(lib.asIndexWithState(this, threadState));
264+
return castToDouble.execute(this);
282265
}
283266

284267
@SuppressWarnings("static-method")

0 commit comments

Comments
 (0)