Skip to content

Commit 84d7832

Browse files
msimacekmsimacek
committed
Simplify PySequence_SetItem/DelItem/Size
1 parent 6c698ef commit 84d7832

File tree

3 files changed

+28
-45
lines changed

3 files changed

+28
-45
lines changed

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

Lines changed: 22 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,13 @@
5555
import static com.oracle.graal.python.nodes.BuiltinNames.T_SEND;
5656
import static com.oracle.graal.python.nodes.ErrorMessages.BASE_MUST_BE;
5757
import static com.oracle.graal.python.nodes.ErrorMessages.OBJ_ISNT_MAPPING;
58-
import static com.oracle.graal.python.nodes.ErrorMessages.P_OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT;
5958
import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___DOC__;
6059
import static com.oracle.graal.python.nodes.SpecialMethodNames.T_ITEMS;
6160
import static com.oracle.graal.python.nodes.SpecialMethodNames.T_KEYS;
6261
import static com.oracle.graal.python.nodes.SpecialMethodNames.T_VALUES;
6362
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GETITEM__;
6463
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___IADD__;
6564
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___IMUL__;
66-
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SETITEM__;
6765

6866
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
6967
import com.oracle.graal.python.builtins.modules.BuiltinConstructors;
@@ -96,7 +94,6 @@
9694
import com.oracle.graal.python.builtins.objects.ints.PInt;
9795
import com.oracle.graal.python.builtins.objects.iterator.IteratorNodes;
9896
import com.oracle.graal.python.builtins.objects.list.PList;
99-
import com.oracle.graal.python.builtins.objects.mappingproxy.PMappingproxy;
10097
import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
10198
import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsSameTypeNode;
10299
import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsTypeNode;
@@ -107,15 +104,16 @@
107104
import com.oracle.graal.python.lib.PyNumberFloatNode;
108105
import com.oracle.graal.python.lib.PyNumberIndexNode;
109106
import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
110-
import com.oracle.graal.python.lib.PyObjectDelItem;
111107
import com.oracle.graal.python.lib.PyObjectGetAttr;
112108
import com.oracle.graal.python.lib.PyObjectGetItem;
113109
import com.oracle.graal.python.lib.PyObjectLookupAttr;
114-
import com.oracle.graal.python.lib.PyObjectSizeNode;
115110
import com.oracle.graal.python.lib.PySequenceCheckNode;
116111
import com.oracle.graal.python.lib.PySequenceContainsNode;
112+
import com.oracle.graal.python.lib.PySequenceDelItemNode;
117113
import com.oracle.graal.python.lib.PySequenceGetItemNode;
118114
import com.oracle.graal.python.lib.PySequenceIterSearchNode;
115+
import com.oracle.graal.python.lib.PySequenceSetItemNode;
116+
import com.oracle.graal.python.lib.PySequenceSizeNode;
119117
import com.oracle.graal.python.lib.PySliceNew;
120118
import com.oracle.graal.python.nodes.ErrorMessages;
121119
import com.oracle.graal.python.nodes.PRaiseNode;
@@ -149,7 +147,6 @@
149147
import com.oracle.truffle.api.dsl.TypeSystemReference;
150148
import com.oracle.truffle.api.frame.VirtualFrame;
151149
import com.oracle.truffle.api.nodes.Node;
152-
import com.oracle.truffle.api.profiles.InlinedConditionProfile;
153150
import com.oracle.truffle.api.strings.TruffleString;
154151

155152
public final class PythonCextAbstractBuiltins {
@@ -501,29 +498,15 @@ Object values(Object obj,
501498

502499
@CApiBuiltin(ret = Int, args = {PyObject, Py_ssize_t, PyObject}, call = Ignored)
503500
public abstract static class PyTruffleSequence_SetItem extends CApiTernaryBuiltinNode {
504-
@Specialization(guards = "checkNode.execute(inliningTarget, obj)", limit = "1")
505-
static Object setItem(Object obj, Object key, Object value,
501+
@Specialization
502+
static Object setItem(Object obj, long key, Object value,
506503
@Bind("this") Node inliningTarget,
507-
@SuppressWarnings("unused") @Exclusive @Cached PySequenceCheckNode checkNode,
508-
@Cached PyObjectLookupAttr lookupAttrNode,
509-
@Cached InlinedConditionProfile hasSetItem,
510-
@Cached CallNode callNode,
511-
@Cached PRaiseNode.Lazy raiseNode) {
512-
Object setItemCallable = lookupAttrNode.execute(null, inliningTarget, obj, T___SETITEM__);
513-
if (hasSetItem.profile(inliningTarget, setItemCallable == PNone.NO_VALUE)) {
514-
throw raiseNode.get(inliningTarget).raise(TypeError, P_OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT, obj);
515-
} else {
516-
callNode.execute(setItemCallable, key, value);
517-
return 0;
504+
@Cached PySequenceSetItemNode setItemNode) {
505+
if ((int) key != key) {
506+
throw PRaiseNode.raiseUncached(inliningTarget, OverflowError, ErrorMessages.CANNOT_FIT_P_INTO_INDEXSIZED_INT, key);
518507
}
519-
}
520-
521-
@Specialization(guards = "!checkNode.execute(inliningTarget, obj)", limit = "1")
522-
static Object setItem(Object obj, @SuppressWarnings("unused") Object key, @SuppressWarnings("unused") Object value,
523-
@SuppressWarnings("unused") @Bind("this") Node inliningTarget,
524-
@SuppressWarnings("unused") @Exclusive @Cached PySequenceCheckNode checkNode,
525-
@Cached PRaiseNode raiseNode) {
526-
throw raiseNode.raise(TypeError, ErrorMessages.IS_NOT_A_SEQUENCE, obj);
508+
setItemNode.execute(obj, (int) key, value);
509+
return 0;
527510
}
528511
}
529512

@@ -673,21 +656,25 @@ protected BinaryArithmetic.AddNode createAdd() {
673656
@CApiBuiltin(ret = Int, args = {PyObject, Py_ssize_t}, call = Ignored)
674657
abstract static class PyTruffleSequence_DelItem extends CApiBinaryBuiltinNode {
675658
@Specialization
676-
static Object run(Object o, Object i,
659+
static Object run(Object o, long i,
677660
@Bind("this") Node inliningTarget,
678-
@Cached PyObjectDelItem delItemNode) {
679-
delItemNode.execute(null, inliningTarget, o, i);
661+
@Cached PySequenceDelItemNode delItemNode) {
662+
if ((int) i != i) {
663+
throw PRaiseNode.raiseUncached(inliningTarget, OverflowError, ErrorMessages.CANNOT_FIT_P_INTO_INDEXSIZED_INT, i);
664+
}
665+
delItemNode.execute(o, (int) i);
680666
return 0;
681667
}
682668
}
683669

684670
@CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, Py_ssize_t}, call = Ignored)
685671
abstract static class PyTruffleSequence_GetItem extends CApiBinaryBuiltinNode {
686672
@Specialization
687-
Object doManaged(Object delegate, long position,
673+
static Object doManaged(Object delegate, long position,
674+
@Bind("this") Node inliningTarget,
688675
@Cached PySequenceGetItemNode getItemNode) {
689676
if ((int) position != position) {
690-
throw PRaiseNode.raiseUncached(this, OverflowError, ErrorMessages.CANNOT_FIT_P_INTO_INDEXSIZED_INT, position);
677+
throw PRaiseNode.raiseUncached(inliningTarget, OverflowError, ErrorMessages.CANNOT_FIT_P_INTO_INDEXSIZED_INT, position);
691678
}
692679
return getItemNode.execute(null, delegate, (int) position);
693680
}
@@ -696,21 +683,11 @@ Object doManaged(Object delegate, long position,
696683
@CApiBuiltin(ret = Py_ssize_t, args = {PyObject}, call = Ignored)
697684
abstract static class PyTruffleSequence_Size extends CApiUnaryBuiltinNode {
698685

699-
// cant use PySequence_Size: PySequence_Size returns the __len__ value also for
700-
// subclasses of types not accepted by PySequence_Check as long they have an overriden
701-
// __len__ method
702686
@Specialization
703-
static Object doSequence(Object obj,
687+
static int doSequence(Object obj,
704688
@Bind("this") Node inliningTarget,
705-
@Cached IsSameTypeNode isSameType,
706-
@Cached GetClassNode getClassNode,
707-
@Cached PyObjectSizeNode sizeNode,
708-
@Cached PRaiseNode.Lazy raiseNode) {
709-
if (obj instanceof PMappingproxy || isSameType.execute(inliningTarget, getClassNode.execute(inliningTarget, obj), PythonBuiltinClassType.PDict)) {
710-
throw raiseNode.get(inliningTarget).raise(TypeError, ErrorMessages.IS_NOT_A_SEQUENCE, obj);
711-
} else {
712-
return sizeNode.execute(null, inliningTarget, obj);
713-
}
689+
@Cached PySequenceSizeNode sizeNode) {
690+
return sizeNode.execute(null, inliningTarget, obj);
714691
}
715692
}
716693

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyDictCheckNode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@
4444
import com.oracle.truffle.api.dsl.Fallback;
4545
import com.oracle.truffle.api.dsl.GenerateCached;
4646
import com.oracle.truffle.api.dsl.GenerateInline;
47+
import com.oracle.truffle.api.dsl.GenerateUncached;
4748
import com.oracle.truffle.api.dsl.Specialization;
4849
import com.oracle.truffle.api.nodes.Node;
4950

5051
@GenerateInline
5152
@GenerateCached(false)
53+
@GenerateUncached
5254
public abstract class PyDictCheckNode extends Node {
5355
public abstract boolean execute(Node inliningTarget, Object object);
5456

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PySequenceCheckNode.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,13 @@ static boolean doNative(PythonAbstractNativeObject object,
9898

9999
@Fallback
100100
static boolean doGeneric(Node inliningTarget, Object object,
101+
@Cached PyDictCheckNode dictCheckNode,
101102
@Cached GetClassNode getClassNode,
102103
@Cached GetMethodsFlagsNode getMethodsFlagsNode,
103104
@Cached LazyInteropLibrary lazyLib) {
105+
if (dictCheckNode.execute(inliningTarget, object)) {
106+
return false;
107+
}
104108
Object type = getClassNode.execute(inliningTarget, object);
105109
if (type == PythonBuiltinClassType.ForeignObject) {
106110
return lazyLib.get(inliningTarget).hasArrayElements(object);

0 commit comments

Comments
 (0)