Support captured variables in debugger

runtime/vm/debugger.h

Index: runtime/vm/debugger.h
===================================================================
--- runtime/vm/debugger.h	(revision 8858)
+++ runtime/vm/debugger.h	(working copy)
@@ -120,7 +120,7 @@
 // on the call stack.
 class ActivationFrame : public ZoneAllocated {
  public:
-  explicit ActivationFrame(uword pc, uword fp, uword sp);
+  explicit ActivationFrame(uword pc, uword fp, uword sp, const Context& ctx);
 
   uword pc() const { return pc_; }
   uword fp() const { return fp_; }
@@ -132,6 +132,7 @@
   RawScript* SourceScript();
   intptr_t TokenIndex();
   intptr_t LineNumber();
+  intptr_t ContextLevel();

[regis, 2012/06/19 18:14:41]

Add comment explaining what is the context level of an activation frame.
I suppose it is the context level of the call that left this frame? 

[hausner, 2012/06/19 18:49:41]

Correct. Added the comment.

   const char* ToCString();
 
   intptr_t NumLocalVariables();
@@ -143,8 +144,12 @@
                   Instance* value);
 
   RawArray* GetLocalVariables();
+  RawContext* CallerContext();
 
  private:
+  intptr_t PcDescIndex();
+  void GetPcDescriptors();
+  void GetVarDescriptors();
   void GetDescIndices();
   RawInstance* GetLocalVarValue(intptr_t slot_index);
   RawInstance* GetInstanceCallReceiver(intptr_t num_actual_args);
@@ -152,12 +157,17 @@
   uword pc_;
   uword fp_;
   uword sp_;
+  const Context& ctx_;
   Function& function_;
   intptr_t token_index_;
+  intptr_t pc_desc_index_;
   intptr_t line_number_;
+  intptr_t context_level_;
 
+  bool vars_initialized_;
   LocalVarDescriptors& var_descriptors_;
   ZoneGrowableArray<intptr_t> desc_indices_;
+  PcDescriptors& pc_desc_;
 
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(ActivationFrame);