Skip to content

Commit 1351c0f

Browse files
committed
PPartial: copy internal array from args tuple
1 parent a09d543 commit 1351c0f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/partial/PPartial.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public PTuple getArgsTuple(PythonObjectFactory factory) {
8181
return argsTuple;
8282
}
8383

84-
public void setArgs(PTuple args, SequenceNodes.GetSequenceStorageNode storageNode, SequenceStorageNodes.GetInternalObjectArrayNode arrayNode) {
84+
public void setArgs(PTuple args, SequenceNodes.GetSequenceStorageNode storageNode, SequenceStorageNodes.ToArrayNode arrayNode) {
8585
this.argsTuple = args;
8686
this.args = arrayNode.execute(storageNode.execute(args));
8787
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/partial/PartialBuiltins.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ Object reduce(PPartial self,
185185
} else {
186186
dict = getDictIfExistsNode.execute(self);
187187
}
188-
return factory().createTuple(new Object[]{
189-
getClassNode.execute(self),
190-
factory().createTuple(new Object[]{self.getFn()}),
191-
factory().createTuple(new Object[]{self.getFn(), self.getArgsTuple(factory()), self.getKw(), (dict != null) ? dict : PNone.NONE})});
188+
final Object type = getClassNode.execute(self);
189+
final PTuple fnTuple = factory().createTuple(new Object[]{self.getFn()});
190+
final PTuple argsTuple = factory().createTuple(new Object[]{self.getFn(), self.getArgsTuple(factory()), self.getKw(), (dict != null) ? dict : PNone.NONE});
191+
return factory().createTuple(new Object[]{type, fnTuple, argsTuple});
192192
}
193193
}
194194

@@ -201,7 +201,7 @@ public Object setState(VirtualFrame frame, PPartial self, PTuple state,
201201
@Cached SetDictNode setDictNode,
202202
@Cached DeleteDictNode deleteDictNode,
203203
@Cached SequenceNodes.GetSequenceStorageNode storageNode,
204-
@Cached SequenceStorageNodes.GetInternalObjectArrayNode arrayNode,
204+
@Cached SequenceStorageNodes.ToArrayNode arrayNode,
205205
@Cached PyCallableCheckNode callableCheckNode,
206206
@Cached PyTupleCheckExactNode tupleCheckExactNode,
207207
@Cached PyDictCheckExactNode dictCheckExactNode,

0 commit comments

Comments
 (0)