Support captured variables in debugger

runtime/vm/raw_object.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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 779 matching lines @@
   uword pc_;  // PC corresponding to this stack map representation.
   intptr_t min_set_bit_offset_;  // Minimum bit offset which is set.
   intptr_t max_set_bit_offset_;  // Maximum bit offset which is set.
 
   // Variable length data follows here (bitmap of the stack layout).
   uint8_t data_[0];
 };
 
 
 class RawLocalVarDescriptors : public RawObject {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(LocalVarDescriptors);
+ public:
+  // Values for field VarInfo.kind. We don't use an enum type because
+  // we want to ensure the field only takes up one byte.
+  static const int8_t kStackVar = 1;
+  static const int8_t kContextVar = 2;
+  static const int8_t kContextLevel = 3;
+  static const int8_t kContextChain = 4;

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

It should not be a problem to use an enum. See enum ClassState and the
corresponding raw field class_state_ as an example.

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

Hmm. I started out with an enum and ran into some problem converting between the
enum type and int8_t. I converted to enum again and it's fine now. Strange. In
any case: done.

 
   struct VarInfo {
     intptr_t index;      // Slot index on stack or in context.
-    intptr_t scope_id;   // Scope to which the variable belongs.
+    int8_t   kind;       // Entry kind.
+    int16_t  scope_id;   // Scope to which the variable belongs.
     intptr_t begin_pos;  // Token position of scope start.
     intptr_t end_pos;    // Token position of scope end.
   };
 
+ private:
+  RAW_HEAP_OBJECT_IMPLEMENTATION(LocalVarDescriptors);
   intptr_t length_;  // Number of descriptors.
   RawArray* names_;  // Array of [length_] variable names.
 
   VarInfo data_[0];   // Variable info with [length_] entries.
 };
 
 
 class RawExceptionHandlers : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExceptionHandlers);
 
@@ skipping 688 matching lines @@
          kExternalUint64Array == kByteArray + 18 &&
          kExternalFloat32Array == kByteArray + 19 &&
          kExternalFloat64Array == kByteArray + 20 &&
          kClosure == kByteArray + 21);
   return (index >= kByteArray && index <= kClosure);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_