Another fix for debugging stack traces and captured variables.

runtime/vm/scopes.cc

Index: runtime/vm/scopes.cc
===================================================================
--- runtime/vm/scopes.cc	(revision 22195)
+++ runtime/vm/scopes.cc	(working copy)
@@ -258,18 +258,28 @@
         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.
     }