Skip to content

Commit 6498d7f

Browse files
committed
LocalsStorage: fix is user frame slot check
1 parent bc63e10 commit 6498d7f

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/LocalsStorage.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,13 @@ public Object forEachUntyped(ForEachNode<Object> node, Object arg) {
220220
bailout();
221221
Object result = arg;
222222
for (FrameSlot slot : this.frame.getFrameDescriptor().getSlots()) {
223-
if (isUserFrameSlot(slot)) {
224-
Object value = getValue(slot);
225-
if (value != null) {
226-
result = node.execute(slot.getIdentifier(), result);
223+
Object identifier = slot.getIdentifier();
224+
if (identifier instanceof String) {
225+
if (isUserFrameSlot(identifier)) {
226+
Object value = getValue(slot);
227+
if (value != null) {
228+
result = node.execute(identifier, result);
229+
}
227230
}
228231
}
229232
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/CopyKeywordsNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public CopyKeywordsState(HashingStorage hashingStorage, PKeyword[] keywords) {
8282
}
8383

8484
void addKeyword(String key, Object value) {
85-
assert i < keywords.length: "CopyKeywordsNode: current index (over hashingStorage) exceeds keywords array length!";
85+
assert i < keywords.length : "CopyKeywordsNode: current index (over hashingStorage) exceeds keywords array length!";
8686
keywords[i++] = new PKeyword(key, value);
8787
}
8888

0 commit comments

Comments
 (0)