Another fix for debugging stack traces and captured variables.

runtime/vm/scopes.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/scopes.h"
 
 #include "vm/ast.h"
 #include "vm/bit_vector.h"
 #include "vm/object.h"
 #include "vm/parser.h"
@@ skipping 240 matching lines @@
           ASSERT(var->owner()->context_level() >= 0);
           desc.info.scope_id = var->owner()->context_level();
         } else {
           desc.info.kind = RawLocalVarDescriptors::kStackVar;
           desc.info.scope_id = *scope_id;
         }
         desc.info.begin_pos = var->token_pos();
         desc.info.end_pos = var->owner()->end_token_pos();
         desc.info.index = var->index();
         vars->Add(desc);
-      } else if (var->name().Equals(
-            Symbols::Name(Symbols::kSavedEntryContextVarId))) {
+      } else if (var->name().Equals(Symbols::SavedEntryContextVar())) {
         // This is the local variable in which the function saves the
         // caller's chain of closure contexts (caller's CTX register).
         VarDesc desc;
         desc.name = &var->name();
-        desc.info.kind = RawLocalVarDescriptors::kContextChain;
+        desc.info.kind = RawLocalVarDescriptors::kSavedEntryContext;
+        desc.info.scope_id = 0;
+        desc.info.begin_pos = 0;
+        desc.info.end_pos = 0;
+        desc.info.index = var->index();
+        vars->Add(desc);
+      } else if (var->name().Equals(Symbols::SavedCurrentContextVar())) {
+        // This is the local variable in which the function saves its
+        // own context before calling a closure function.
+        VarDesc desc;
+        desc.name = &var->name();
+        desc.info.kind = RawLocalVarDescriptors::kSavedCurrentContext;
         desc.info.scope_id = 0;
         desc.info.begin_pos = 0;
         desc.info.end_pos = 0;
         desc.info.index = var->index();
         vars->Add(desc);
       }
       // The saved arguments descriptor variable is not currently collected.
     }
   }
   LocalScope* child = this->child();
@@ skipping 287 matching lines @@
     return (fixed_parameter_count - 1) - (index() - kLastParamSlotIndex);
   } else {
     // Shift negative indexes so that the lowest one is 0 (they are still
     // non-positive).
     return fixed_parameter_count - (index() - kFirstLocalSlotIndex);
   }
 }
 
 
 }  // namespace dart