LocalsStorage: fix forEachUntyped message (skip non user frame slots)

Author: cosminbasca

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

@@ -40,6 +40,8 @@
  */
 package com.oracle.graal.python.builtins.objects.common;
 
+import static com.oracle.graal.python.nodes.frame.FrameSlotIDs.isUserFrameSlot;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -51,7 +53,6 @@
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.nodes.PGuards;
-import com.oracle.graal.python.nodes.frame.FrameSlotIDs;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -117,7 +118,7 @@ private void calculateLength() {
         this.len = this.frame.getFrameDescriptor().getSize();
         for (FrameSlot slot : this.frame.getFrameDescriptor().getSlots()) {
             Object identifier = slot.getIdentifier();
-            if (!FrameSlotIDs.isUserFrameSlot(identifier) || getValue(frame, slot) == null) {
+            if (!isUserFrameSlot(identifier) || getValue(frame, slot) == null) {
                 this.len--;
             }
         }
@@ -137,7 +138,7 @@ static Object getItemCached(LocalsStorage self, String key, ThreadState state,
 
         @Specialization(replaces = "getItemCached")
         static Object string(LocalsStorage self, String key, ThreadState state) {
-            if (!FrameSlotIDs.isUserFrameSlot(key)) {
+            if (!isUserFrameSlot(key)) {
                 return null;
             }
             FrameSlot slot = findSlot(self, key);
@@ -219,9 +220,11 @@ public Object forEachUntyped(ForEachNode<Object> node, Object arg) {
         bailout();
         Object result = arg;
         for (FrameSlot slot : this.frame.getFrameDescriptor().getSlots()) {
-            Object value = getValue(slot);
-            if (value != null) {
-                result = node.execute(slot.getIdentifier(), result);
+            if (isUserFrameSlot(slot)) {
+                Object value = getValue(slot);
+                if (value != null) {
+                    result = node.execute(slot.getIdentifier(), result);
+                }
             }
         }
         return result;
@@ -372,7 +375,7 @@ protected boolean loadNext() {
                 FrameSlot nextCandidate = this.slots.get(this.index++);
                 Object identifier = nextCandidate.getIdentifier();
                 if (identifier instanceof String) {
-                    if (FrameSlotIDs.isUserFrameSlot(identifier)) {
+                    if (isUserFrameSlot(identifier)) {
                         Object nextValue = getValue(this.frame, nextCandidate);
                         if (nextValue != null) {
                             this.nextFrameSlot = nextCandidate;
@@ -399,7 +402,7 @@ protected boolean loadNext() {
                 FrameSlot nextCandidate = this.slots.get(this.index--);
                 Object identifier = nextCandidate.getIdentifier();
                 if (identifier instanceof String) {
-                    if (FrameSlotIDs.isUserFrameSlot(identifier)) {
+                    if (isUserFrameSlot(identifier)) {
                         Object nextValue = getValue(this.frame, nextCandidate);
                         if (nextValue != null) {
                             this.nextFrameSlot = nextCandidate;