Support captured variables in debugger

runtime/vm/compiler.cc

 // 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.
 
 #include "vm/compiler.h"
 
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 400 matching lines @@
       OS::Print("}\n");
       OS::Print("Variable Descriptors for function '%s' {\n",
                 function_fullname);
       const LocalVarDescriptors& var_descriptors =
           LocalVarDescriptors::Handle(code.var_descriptors());
       intptr_t var_desc_length =
           var_descriptors.IsNull() ? 0 : var_descriptors.Length();
       String& var_name = String::Handle();
       for (intptr_t i = 0; i < var_desc_length; i++) {
         var_name = var_descriptors.GetName(i);
-        intptr_t scope_id, begin_pos, end_pos;
-        var_descriptors.GetScopeInfo(i, &scope_id, &begin_pos, &end_pos);
-        intptr_t slot = var_descriptors.GetSlotIndex(i);
-        OS::Print("  var %s scope %ld (valid %d-%d) offset %ld\n",
-                  var_name.ToCString(), scope_id, begin_pos, end_pos, slot);
+        RawLocalVarDescriptors::VarInfo var_info;
+        var_descriptors.GetInfo(i, &var_info);
+        if (var_info.kind == RawLocalVarDescriptors::kContextLevel) {
+          OS::Print("  context level %d scope %d (valid %d-%d)\n",
+                    var_info.index,
+                    var_info.scope_id,
+                    var_info.begin_pos,
+                    var_info.end_pos);
+        } else if (var_info.kind == RawLocalVarDescriptors::kContextChain) {
+            OS::Print("  saved CTX reg offset %d\n", var_info.index);
+        } else if (var_info.kind == RawLocalVarDescriptors::kStackVar) {
+          OS::Print("  stack var '%s' offset %d (valid %d-%d) \n",
+                    var_name.ToCString(),
+                    var_info.index,
+                    var_info.begin_pos,
+                    var_info.end_pos);
+        } else if (var_info.kind == RawLocalVarDescriptors::kContextVar) {
+          OS::Print("  context var '%s' level %d offset %d (valid %d-%d)\n",
+                    var_name.ToCString(),
+                    var_info.scope_id,
+                    var_info.index,
+                    var_info.begin_pos,
+                    var_info.end_pos);
+        }
       }
       OS::Print("}\n");
       OS::Print("Exception Handlers for function '%s' {\n", function_fullname);
       const ExceptionHandlers& handlers =
           ExceptionHandlers::Handle(code.exception_handlers());
       OS::Print("%s", handlers.ToCString());
       OS::Print("}\n");
     }
     isolate->set_long_jump_base(base);
     return Error::null();
@@ skipping 117 matching lines @@
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 
 }  // namespace dart