Intrinsify vars builtin to fix frame handling issues

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -69,6 +69,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.__BUILTINS__;
 import static com.oracle.graal.python.nodes.BuiltinNames.__DEBUG__;
 import static com.oracle.graal.python.nodes.BuiltinNames.__GRAALPYTHON__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__FORMAT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEXT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ROUND__;
@@ -2218,6 +2219,31 @@ static Object getLocalsDict(VirtualFrame frame, Node n, ReadLocalsNode readLocal
                 return readLocalsNode.execute(frame, materializeNode.execute(frame, n, false, false, generatorFrame));
             }
         }
+
+        public static LocalsNode create() {
+            return BuiltinFunctionsFactory.LocalsNodeFactory.create(null);
+        }
+    }
+
+    @Builtin(name = "vars", maxNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class VarsNode extends PythonUnaryBuiltinNode {
+
+        @Specialization(guards = "isNoValue(none)")
+        Object vars(VirtualFrame frame, @SuppressWarnings("unused") PNone none,
+                        @Cached LocalsNode localsNode) {
+            return localsNode.execute(frame);
+        }
+
+        @Specialization(guards = "!isNoValue(obj)")
+        Object vars(VirtualFrame frame, Object obj,
+                        @Cached PyObjectLookupAttr lookupAttr) {
+            Object dict = lookupAttr.execute(frame, obj, __DICT__);
+            if (dict == NO_VALUE) {
+                throw raise(TypeError, ErrorMessages.VARS_ARGUMENT_MUST_HAVE_DICT);
+            }
+            return dict;
+        }
     }
 
     @Builtin(name = "open", minNumOfPositionalArgs = 1, parameterNames = {"file", "mode", "buffering", "encoding", "errors", "newline", "closefd", "opener"})

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -709,6 +709,7 @@ public abstract class ErrorMessages {
     public static final String UNSUPPORTED_USE_OF_SYS_EXECUTABLE = "internal error: unsupported use of sys.executable";
     public static final String UTIME_CANNOT_USE_DIR_FD_AND_FOLLOW_SYMLINKS = "utime: cannot use dir_fd and follow_symlinks together on this platform";
     public static final String VALUE_TOO_LARGE_TO_FIT_INTO_INDEX = "value too large to fit into index-sized integer";
+    public static final String VARS_ARGUMENT_MUST_HAVE_DICT = "vars() argument must have __dict__ attribute";
     public static final String WAS_NOT_POSSIBLE_TO_MARSHAL = "Was not possible to marshal";
     public static final String WAS_NOT_POSSIBLE_TO_MARSHAL_P = "Was not possible to marshal %p";
     public static final String WEAK_OBJ_GONE_AWAY = "weak object has gone away";

graalpython/lib-graalpython/builtins.py

@@ -52,24 +52,6 @@ def _f(): pass
 descriptor = type(FunctionType.__code__)
 
 
-from sys import _getframe as __getframe__
-
-
-@__graalpython__.builtin
-def vars(module, *obj):
-    """Return a dictionary of all the attributes currently bound in obj.  If
-    called with no argument, return the variables bound in local scope."""
-    if len(obj) == 0:
-        # TODO inlining _caller_locals().items() in the dict comprehension does not work for now, investigate!
-        return __getframe__(0).f_locals
-    elif len(obj) != 1:
-        raise TypeError("vars() takes at most 1 argument.")
-    try:
-        return obj[0].__dict__
-    except AttributeError:
-        raise TypeError("vars() argument must have __dict__ attribute")
-
-
 @__graalpython__.builtin
 def input(module, prompt=None):
     import sys