Replace CollectVariables with locals(), update callsites to walk locals instead

src/ast/scopes.h

Index: src/ast/scopes.h
diff --git a/src/ast/scopes.h b/src/ast/scopes.h
index 8a84664c18ec44d657ebc85db9208c98d3b66c5f..ce98f766b5fba8cbc539d2de6cd2517529d65a75 100644
--- a/src/ast/scopes.h
+++ b/src/ast/scopes.h
@@ -144,6 +144,8 @@ class Scope: public ZoneObject {
   // Declarations list.
   ZoneList<Declaration*>* declarations() { return &decls_; }
 
+  ZoneList<Variable*>* locals() { return &locals_; }
+
   // Create a new unresolved variable.
   VariableProxy* NewUnresolved(AstNodeFactory* factory,
                                const AstRawString* name,
@@ -340,20 +342,12 @@ class Scope: public ZoneObject {
   // ---------------------------------------------------------------------------
   // Variable allocation.
 
-  // Collect variables in this scope. Note that the function variable - if
-  // present - is not collected and should be handled separately.
-  void CollectVariables(ZoneList<Variable*>* stack_locals,
-                        ZoneList<Variable*>* context_locals,
-                        ZoneList<Variable*>* context_globals);
-
   // Result of variable allocation.
   int num_stack_slots() const { return num_stack_slots_; }
   int num_heap_slots() const { return num_heap_slots_; }
-  int num_global_slots() const { return num_global_slots_; }
 
   int StackLocalCount() const;
   int ContextLocalCount() const;
-  int ContextGlobalCount() const;
 
   // Determine if we can parse a function literal in this scope lazily.
   bool AllowsLazyParsing() const;
@@ -483,7 +477,6 @@ class Scope: public ZoneObject {
   // Computed via AllocateVariables.
   int num_stack_slots_;
   int num_heap_slots_;
-  int num_global_slots_;
 
   // The scope type.
   const ScopeType scope_type_;