Fix: 'LocalsStorage.hasKey' must also check value.

fangerer · fangerer · commit b123dc9a363b · 2019-06-11T14:09:34.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/LocalsStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/LocalsStorage.java
@@ -118,7 +118,9 @@ public boolean hasKey(Object key, Equivalence eq) {
         if (!FrameSlotIDs.isUserFrameSlot(key)) {
             return false;
         }
-        return frame.getFrameDescriptor().findFrameSlot(key) != null;
+        // Deleting variables from a frame means to write 'null' into the slot. So we also need to
+        // check the value.
+        return frame.getFrameDescriptor().findFrameSlot(key) != null && getItem(key, eq) != null;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ public boolean hasKey(Object key, Equivalence eq) {`
`118`	`118`	`if (!FrameSlotIDs.isUserFrameSlot(key)) {`
`119`	`119`	`return false;`
`120`	`120`	`}`
`121`		`- return frame.getFrameDescriptor().findFrameSlot(key) != null;`
	`121`	`+ // Deleting variables from a frame means to write 'null' into the slot. So we also need to`
	`122`	`+ // check the value.`
	`123`	`+ return frame.getFrameDescriptor().findFrameSlot(key) != null && getItem(key, eq) != null;`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`@Override`