Skip to content

Commit 8226655

Browse files
committed
Avoid specific upcall for PySequence_Check and PyMapping_Check
1 parent 020d852 commit 8226655

File tree

2 files changed

+0
-31
lines changed

2 files changed

+0
-31
lines changed

graalpython/com.oracle.graal.python.cext/src/abstract.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,10 +1687,6 @@ PyNumber_ToBase(PyObject *n, int base)
16871687
int
16881688
PySequence_Check(PyObject *s)
16891689
{
1690-
// GraalPy change: upcall for managed
1691-
if (points_to_py_handle_space(s)) {
1692-
return GraalPyTruffleSequence_Check(s);
1693-
}
16941690
if (PyDict_Check(s))
16951691
return 0;
16961692
return Py_TYPE(s)->tp_as_sequence &&
@@ -2297,10 +2293,6 @@ PySequence_Index(PyObject *s, PyObject *o)
22972293
int
22982294
PyMapping_Check(PyObject *o)
22992295
{
2300-
// GraalPy change: upcall for managed
2301-
if (points_to_py_handle_space(o)) {
2302-
return GraalPyTruffleMapping_Check(o);
2303-
}
23042296
return o && Py_TYPE(o)->tp_as_mapping &&
23052297
Py_TYPE(o)->tp_as_mapping->mp_subscript;
23062298
}

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
5353
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
5454
import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyTypeObject__tp_doc;
55-
import static com.oracle.graal.python.builtins.objects.ints.PInt.intValue;
5655
import static com.oracle.graal.python.nodes.BuiltinNames.T_SEND;
5756
import static com.oracle.graal.python.nodes.ErrorMessages.BASE_MUST_BE;
5857
import static com.oracle.graal.python.nodes.ErrorMessages.OBJ_ISNT_MAPPING;
@@ -103,7 +102,6 @@
103102
import com.oracle.graal.python.lib.GetNextNode;
104103
import com.oracle.graal.python.lib.PyIndexCheckNode;
105104
import com.oracle.graal.python.lib.PyIterCheckNode;
106-
import com.oracle.graal.python.lib.PyMappingCheckNode;
107105
import com.oracle.graal.python.lib.PyNumberCheckNode;
108106
import com.oracle.graal.python.lib.PyNumberFloatNode;
109107
import com.oracle.graal.python.lib.PyNumberIndexNode;
@@ -680,16 +678,6 @@ static Object run(Object o, Object i,
680678
}
681679
}
682680

683-
@CApiBuiltin(ret = Int, args = {PyObject}, call = Ignored)
684-
abstract static class PyTruffleSequence_Check extends CApiUnaryBuiltinNode {
685-
@Specialization
686-
static int check(Object object,
687-
@Bind("this") Node inliningTarget,
688-
@Cached PySequenceCheckNode check) {
689-
return intValue(check.execute(inliningTarget, object));
690-
}
691-
}
692-
693681
@CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, Py_ssize_t}, call = Ignored)
694682
abstract static class PyTruffleSequence_GetItem extends CApiBinaryBuiltinNode {
695683
@Specialization
@@ -882,17 +870,6 @@ static Object values(Object obj,
882870
}
883871
}
884872

885-
@CApiBuiltin(ret = Int, args = {PyObject}, call = Direct)
886-
abstract static class PyTruffleMapping_Check extends CApiUnaryBuiltinNode {
887-
888-
@Specialization
889-
static int doPythonObject(Object object,
890-
@Bind("this") Node inliningTarget,
891-
@Cached PyMappingCheckNode checkNode) {
892-
return intValue(checkNode.execute(inliningTarget, object));
893-
}
894-
}
895-
896873
@CApiBuiltin(ret = Py_ssize_t, args = {PyObject}, call = Ignored)
897874
abstract static class PyTruffleMapping_Size extends CApiUnaryBuiltinNode {
898875

0 commit comments

Comments
 (0)