Support captured variables in debugger

runtime/vm/scopes.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_SCOPES_H_
 #define VM_SCOPES_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/growable_array.h"
@@ skipping 60 matching lines @@
   }
 
   bool Equals(const LocalVariable& other) const;
 
   // Map the frame index to a bit-vector index.  Assumes the variable is
   // allocated to the frame.
   // var_count is the total number of stack-allocated variables including
   // all parameters.
   int BitIndexIn(intptr_t var_count) const;
 
+  // Name of the internal variable that is used to save the context chain
+  // on function entry.
+  static const char* kSavedContextVarName;
+
  private:
   static const int kUnitializedIndex = INT_MIN;
 
   const intptr_t token_index_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this variable.
 
   const AbstractType& type_;  // Declaration type of local variable.
 
   bool is_final_;  // If true, this variable is readonly.
@@ skipping 120 matching lines @@
   int context_level() const {
     ASSERT(HasContextLevel());
     return context_level_;
   }
   void set_context_level(int context_level) {
     ASSERT(!HasContextLevel());
     ASSERT(context_level != kUnitializedContextLevel);
     context_level_ = context_level;
   }
 
+  intptr_t begin_token_index() const { return begin_token_index_; }
+  void set_begin_token_index(intptr_t value) { begin_token_index_ = value; }
+
   intptr_t end_token_index() const { return end_token_index_; }
   void set_end_token_index(intptr_t value) { end_token_index_ = value; }
 
   // The number of variables allocated in the context and belonging to this
   // scope and to its children at the same loop level.
   int num_context_variables() const { return num_context_variables_; }
 
   // Add a variable to the scope. Returns false if a variable with the
   // same name is already present.
   bool AddVariable(LocalVariable* variable);
@@ skipping 55 matching lines @@
   // Two locals in different sibling scopes may share the same frame slot.
   // Return the index of the next available frame slot.
   int AllocateVariables(int first_parameter_index,
                         int num_parameters,
                         int first_frame_index,
                         LocalScope* loop_owner,
                         LocalScope** context_owner);
 
   // Creates variable info for the scope and all its nested scopes.
   // Must be called after AllocateVariables() has been called.
-  RawLocalVarDescriptors* GetVarDescriptors();
+  RawLocalVarDescriptors* GetVarDescriptors(const Function& func);
 
   // Create a ContextScope object describing all captured variables referenced
   // from this scope and belonging to outer scopes.
   RawContextScope* PreserveOuterScope(int current_context_level) const;
 
   // Creates a LocalScope representing the outer scope of a local function to be
   // compiled. This outer scope contains the variables captured by the function
   // as specified by the given ContextScope, which was created during the
   // compilation of the enclosing function.
   static LocalScope* RestoreOuterScope(const ContextScope& context_scope);
 
   // Create a ContextScope object which will capture "this" for an implicit
   // closure object.
   static RawContextScope* CreateImplicitClosureScope(const Function& func);
 
  private:
+  struct VarDesc {
+    const String* name;
+    RawLocalVarDescriptors::VarInfo info;
+  };
+
   // Allocate the variable in the current context, possibly updating the current
   // context owner scope, if the variable is the first one to be allocated at
   // this loop level.
   // The variable may belong to this scope or to any of its children, but at the
   // same loop level.
   void AllocateContextVariable(LocalVariable* variable,
                                LocalScope** context_owner);
 
-  void CollectLocalVariables(GrowableArray<LocalVariable*>* vars);
+  void CollectLocalVariables(GrowableArray<VarDesc>* vars, int16_t* scope_id);
 
   static const int kUnitializedContextLevel = INT_MIN;
   LocalScope* parent_;
   LocalScope* child_;
   LocalScope* sibling_;
   int function_level_;  // Reflects the nesting level of local functions.
-  int loop_level_;  // Reflects the loop nesting level.
-  int context_level_;  // Reflects the level of the runtime context.
-  int num_context_variables_;  // Only set if this scope is a context owner.
-  intptr_t end_token_index_;  // Token index of end of scope.
+  int loop_level_;      // Reflects the loop nesting level.
+  int context_level_;   // Reflects the level of the runtime context.
+  int num_context_variables_;   // Only set if this scope is a context owner.
+  intptr_t begin_token_index_;  // Token index of beginning of scope.
+  intptr_t end_token_index_;    // Token index of end of scope.
   GrowableArray<LocalVariable*> variables_;
   GrowableArray<SourceLabel*> labels_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCOPES_H_