Skip to content

Commit 95108ec

Browse files
steve-ssteve-s
committed
Fix test_assign
1 parent 820d5dc commit 95108ec

File tree

2 files changed

+58
-35
lines changed

2 files changed

+58
-35
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static Object doGeneric(VirtualFrame frame, Node inliningTarget, Object object,
127127
@GenerateUncached
128128
@GenerateInline
129129
@GenerateCached(false)
130-
abstract static class PyObjectGetItemGeneric extends PNodeWithContext {
130+
public abstract static class PyObjectGetItemGeneric extends PNodeWithContext {
131131
public abstract Object execute(Frame frame, Node inliningTarget, Object object, TpSlots objectKlassSlots, Object key);
132132

133133
@Specialization(guards = "slots.mp_subscript() != null")

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

+57-34
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
/*
2+
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
141
package com.oracle.graal.python.nodes.bytecode_dsl;
242

343
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.AttributeError;
@@ -10,14 +50,11 @@
1050
import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___DOC__;
1151
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___AENTER__;
1252
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___AEXIT__;
13-
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___ENTER__;
14-
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___EXIT__;
1553
import static com.oracle.graal.python.runtime.exception.PythonErrorType.AssertionError;
1654
import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
1755

1856
import java.math.BigInteger;
1957
import java.util.ArrayList;
20-
import java.util.Arrays;
2158
import java.util.Iterator;
2259

2360
import com.oracle.graal.python.PythonLanguage;
@@ -35,7 +72,6 @@
3572
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageSetItem;
3673
import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
3774
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
38-
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ListGeneralizationNode;
3975
import com.oracle.graal.python.builtins.objects.dict.DictBuiltins;
4076
import com.oracle.graal.python.builtins.objects.dict.DictNodes;
4177
import com.oracle.graal.python.builtins.objects.dict.PDict;
@@ -50,26 +86,23 @@
5086
import com.oracle.graal.python.builtins.objects.function.Signature;
5187
import com.oracle.graal.python.builtins.objects.generator.CommonGeneratorBuiltins;
5288
import com.oracle.graal.python.builtins.objects.generator.PGenerator;
53-
import com.oracle.graal.python.builtins.objects.iterator.IteratorNodes;
5489
import com.oracle.graal.python.builtins.objects.iterator.PDoubleSequenceIterator;
5590
import com.oracle.graal.python.builtins.objects.iterator.PIntRangeIterator;
5691
import com.oracle.graal.python.builtins.objects.iterator.PIntegerIterator;
5792
import com.oracle.graal.python.builtins.objects.iterator.PIntegerSequenceIterator;
5893
import com.oracle.graal.python.builtins.objects.iterator.PLongSequenceIterator;
5994
import com.oracle.graal.python.builtins.objects.iterator.PObjectSequenceIterator;
60-
import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListExtendNode;
6195
import com.oracle.graal.python.builtins.objects.list.PList;
6296
import com.oracle.graal.python.builtins.objects.set.PFrozenSet;
6397
import com.oracle.graal.python.builtins.objects.set.PSet;
6498
import com.oracle.graal.python.builtins.objects.set.SetNodes;
6599
import com.oracle.graal.python.builtins.objects.str.StringUtils;
66100
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
67101
import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
68-
import com.oracle.graal.python.builtins.objects.type.TypeFlags;
102+
import com.oracle.graal.python.builtins.objects.type.TpSlots;
103+
import com.oracle.graal.python.builtins.objects.type.TpSlots.GetObjectSlotsNode;
69104
import com.oracle.graal.python.compiler.CodeUnit;
70-
import com.oracle.graal.python.compiler.OpCodes;
71105
import com.oracle.graal.python.compiler.RaisePythonExceptionErrorCallback;
72-
import com.oracle.graal.python.compiler.OpCodes.CollectionBits;
73106
import com.oracle.graal.python.lib.GetNextNode;
74107
import com.oracle.graal.python.lib.PyIterCheckNode;
75108
import com.oracle.graal.python.lib.PyNumberAddNode;
@@ -85,7 +118,6 @@
85118
import com.oracle.graal.python.lib.PyObjectLookupAttr;
86119
import com.oracle.graal.python.lib.PyObjectReprAsTruffleStringNode;
87120
import com.oracle.graal.python.lib.PyObjectSetAttr;
88-
import com.oracle.graal.python.lib.PyObjectSetAttrNodeGen;
89121
import com.oracle.graal.python.lib.PyObjectSetItem;
90122
import com.oracle.graal.python.lib.PyObjectSizeNode;
91123
import com.oracle.graal.python.lib.PyObjectStrAsTruffleStringNode;
@@ -101,17 +133,12 @@
101133
import com.oracle.graal.python.nodes.argument.keywords.SameDictKeyException;
102134
import com.oracle.graal.python.nodes.attributes.GetAttributeNode.GetFixedAttributeNode;
103135
import com.oracle.graal.python.nodes.builtins.ListNodes;
104-
import com.oracle.graal.python.nodes.bytecode.BinarySubscrSeq;
105-
import com.oracle.graal.python.nodes.bytecode.BinarySubscrSeqFactory;
106136
import com.oracle.graal.python.nodes.bytecode.GetSendValueNode;
107137
import com.oracle.graal.python.nodes.bytecode.GetTPFlagsNode;
108138
import com.oracle.graal.python.nodes.bytecode.GetYieldFromIterNode;
109139
import com.oracle.graal.python.nodes.bytecode.ImportFromNode;
110140
import com.oracle.graal.python.nodes.bytecode.ImportNode;
111141
import com.oracle.graal.python.nodes.bytecode.ImportStarNode;
112-
import com.oracle.graal.python.nodes.bytecode.PBytecodeGeneratorFunctionRootNode;
113-
import com.oracle.graal.python.nodes.bytecode.PBytecodeGeneratorRootNode;
114-
import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
115142
import com.oracle.graal.python.nodes.bytecode.PrintExprNode;
116143
import com.oracle.graal.python.nodes.bytecode.RaiseNode;
117144
import com.oracle.graal.python.nodes.bytecode.SetupAnnotationsNode;
@@ -121,7 +148,6 @@
121148
import com.oracle.graal.python.nodes.call.special.CallTernaryMethodNode;
122149
import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
123150
import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
124-
import com.oracle.graal.python.nodes.call.special.LookupAndCallTernaryNode;
125151
import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodSlotNode;
126152
import com.oracle.graal.python.nodes.exception.ExceptMatchNode;
127153
import com.oracle.graal.python.nodes.expression.BinaryArithmetic.BitAndNode;
@@ -152,17 +178,16 @@
152178
import com.oracle.graal.python.nodes.frame.WriteGlobalNode;
153179
import com.oracle.graal.python.nodes.frame.WriteNameNode;
154180
import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
155-
import com.oracle.graal.python.nodes.object.GetClassNode.GetPythonObjectClassNode;
156181
import com.oracle.graal.python.nodes.object.GetClassNode;
182+
import com.oracle.graal.python.nodes.object.GetClassNode.GetPythonObjectClassNode;
157183
import com.oracle.graal.python.nodes.object.IsNode;
158184
import com.oracle.graal.python.nodes.truffle.PythonTypes;
159185
import com.oracle.graal.python.nodes.util.ExceptionStateNodes;
160186
import com.oracle.graal.python.runtime.ExecutionContext.CalleeContext;
187+
import com.oracle.graal.python.runtime.PythonContext;
161188
import com.oracle.graal.python.runtime.PythonContext.ProfileEvent;
162189
import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
163190
import com.oracle.graal.python.runtime.PythonContext.TraceEvent;
164-
import com.oracle.graal.python.runtime.PythonContext;
165-
import com.oracle.graal.python.runtime.PythonOptions;
166191
import com.oracle.graal.python.runtime.exception.ExceptionUtils;
167192
import com.oracle.graal.python.runtime.exception.PException;
168193
import com.oracle.graal.python.runtime.exception.PythonErrorType;
@@ -179,12 +204,9 @@
179204
import com.oracle.truffle.api.Assumption;
180205
import com.oracle.truffle.api.CompilerAsserts;
181206
import com.oracle.truffle.api.CompilerDirectives;
182-
import com.oracle.truffle.api.RootCallTarget;
183207
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
184208
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
185209
import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
186-
import com.oracle.truffle.api.Truffle;
187-
import com.oracle.truffle.api.TruffleLanguage;
188210
import com.oracle.truffle.api.bytecode.BytecodeConfig;
189211
import com.oracle.truffle.api.bytecode.BytecodeLocation;
190212
import com.oracle.truffle.api.bytecode.BytecodeNode;
@@ -217,14 +239,12 @@
217239
import com.oracle.truffle.api.exception.AbstractTruffleException;
218240
import com.oracle.truffle.api.frame.Frame;
219241
import com.oracle.truffle.api.frame.FrameDescriptor;
220-
import com.oracle.truffle.api.frame.MaterializedFrame;
221242
import com.oracle.truffle.api.frame.VirtualFrame;
222243
import com.oracle.truffle.api.library.CachedLibrary;
223244
import com.oracle.truffle.api.nodes.EncapsulatingNodeReference;
224245
import com.oracle.truffle.api.nodes.ExplodeLoop;
225246
import com.oracle.truffle.api.nodes.Node;
226247
import com.oracle.truffle.api.nodes.UnexpectedResultException;
227-
import com.oracle.truffle.api.nodes.Node.Child;
228248
import com.oracle.truffle.api.object.DynamicObjectLibrary;
229249
import com.oracle.truffle.api.profiles.InlinedBranchProfile;
230250
import com.oracle.truffle.api.source.Source;
@@ -3698,47 +3718,50 @@ public static boolean doObject(long typeFlags, Object value,
36983718
public static final class BinarySubscript {
36993719
// TODO: the result is not BE'd because of the UnexpectedResultException. maybe we should
37003720
// explicitly check for an int storage type?
3701-
@Specialization(rewriteOn = UnexpectedResultException.class)
3721+
@Specialization(rewriteOn = UnexpectedResultException.class, guards = "isBuiltinList(list)")
37023722
public static int doIntList(PList list, int index,
37033723
@Shared @Cached("createForList()") SequenceStorageNodes.GetItemNode getListItemNode) throws UnexpectedResultException {
37043724
return getListItemNode.executeInt(list.getSequenceStorage(), index);
37053725
}
37063726

3707-
@Specialization(rewriteOn = UnexpectedResultException.class)
3727+
@Specialization(rewriteOn = UnexpectedResultException.class, guards = "isBuiltinList(list)")
37083728
public static double doDoubleList(PList list, int index,
37093729
@Shared @Cached("createForList()") SequenceStorageNodes.GetItemNode getListItemNode) throws UnexpectedResultException {
37103730
return getListItemNode.executeDouble(list.getSequenceStorage(), index);
37113731
}
37123732

3713-
@Specialization(replaces = {"doIntList", "doDoubleList"})
3714-
public static Object doObjectList(PList sequence, int index,
3733+
@Specialization(replaces = {"doIntList", "doDoubleList"}, guards = "isBuiltinList(list)")
3734+
public static Object doObjectList(PList list, int index,
37153735
@Shared @Cached("createForList()") SequenceStorageNodes.GetItemNode getListItemNode) {
3716-
return getListItemNode.execute(sequence.getSequenceStorage(), index);
3736+
return getListItemNode.execute(list.getSequenceStorage(), index);
37173737
}
37183738

3719-
@Specialization(rewriteOn = UnexpectedResultException.class)
3739+
@Specialization(rewriteOn = UnexpectedResultException.class, guards = "isBuiltinTuple(tuple)")
37203740
public static int doIntTuple(PTuple tuple, int index,
37213741
@Shared @Cached("createForTuple()") SequenceStorageNodes.GetItemNode getTupleItemNode) throws UnexpectedResultException {
37223742
return getTupleItemNode.executeInt(tuple.getSequenceStorage(), index);
37233743

37243744
}
37253745

3726-
@Specialization(rewriteOn = UnexpectedResultException.class)
3746+
@Specialization(rewriteOn = UnexpectedResultException.class, guards = "isBuiltinTuple(tuple)")
37273747
public static double doDoubleTuple(PTuple tuple, int index,
37283748
@Shared @Cached("createForTuple()") SequenceStorageNodes.GetItemNode getTupleItemNode) throws UnexpectedResultException {
37293749
return getTupleItemNode.executeDouble(tuple.getSequenceStorage(), index);
37303750
}
37313751

3732-
@Specialization(replaces = {"doIntTuple", "doDoubleTuple"})
3752+
@Specialization(replaces = {"doIntTuple", "doDoubleTuple"}, guards = "isBuiltinTuple(tuple)")
37333753
public static Object doObjectTuple(PTuple tuple, int index,
37343754
@Shared @Cached("createForTuple()") SequenceStorageNodes.GetItemNode getTupleItemNode) {
37353755
return getTupleItemNode.execute(tuple.getSequenceStorage(), index);
37363756
}
37373757

37383758
@Fallback
37393759
public static Object doOther(VirtualFrame frame, Object receiver, Object key,
3740-
@Cached(inline = false) PyObjectGetItem getItemNode) {
3741-
return getItemNode.executeCached(frame, receiver, key);
3760+
@Bind("this") Node inliningTarget,
3761+
@Cached GetObjectSlotsNode getSlotsNode,
3762+
@Cached PyObjectGetItem.PyObjectGetItemGeneric getItemNode) {
3763+
TpSlots slots = getSlotsNode.execute(inliningTarget, receiver);
3764+
return getItemNode.execute(frame, inliningTarget, receiver, slots, key);
37423765
}
37433766
}
37443767

0 commit comments

Comments
 (0)