Don't use a special var descriptor for :async_op since it can now be either stack or context alloca…

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/object.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
@@ skipping 232 matching lines @@
     if (child_frame_index < min_frame_index) {
       min_frame_index = child_frame_index;
     }
     child = child->sibling();
   }
   return min_frame_index;
 }
 
 
 // The parser creates internal variables that start with ":"
-static bool IsInternalIdentifier(const String& str) {
+static bool IsFilteredIdentifier(const String& str) {
   ASSERT(str.Length() > 0);
+  if (str.raw() == Symbols::AsyncOperation().raw()) {
+    // Keep :async_op for asynchronous debugging.
+    return false;
+  }
   return str.CharAt(0) == ':';
 }
 
 
 RawLocalVarDescriptors* LocalScope::GetVarDescriptors(const Function& func) {
   GrowableArray<VarDesc> vars(8);
   // First enter all variables from scopes of outer functions.
   const ContextScope& context_scope =
       ContextScope::Handle(func.context_scope());
   if (!context_scope.IsNull()) {
     ASSERT(func.IsLocalFunction());
     for (int i = 0; i < context_scope.num_variables(); i++) {
       String& name = String::Handle(context_scope.NameAt(i));
       RawLocalVarDescriptors::VarInfoKind kind;
-      if (!IsInternalIdentifier(name)) {
+      if (!IsFilteredIdentifier(name)) {
         kind = RawLocalVarDescriptors::kContextVar;
-      } else if (name.raw() == Symbols::AsyncOperation().raw()) {
-        kind = RawLocalVarDescriptors::kAsyncOperation;
       } else {
         continue;
       }
 
       VarDesc desc;
       desc.name = &name;
       desc.info.set_kind(kind);
       desc.info.scope_id = context_scope.ContextLevelAt(i);
       desc.info.begin_pos = begin_token_pos();
       desc.info.end_pos = end_token_pos();
@@ skipping 29 matching lines @@
     desc.info.set_kind(RawLocalVarDescriptors::kContextLevel);
     desc.info.scope_id = *scope_id;
     desc.info.begin_pos = begin_token_pos();
     desc.info.end_pos = end_token_pos();
     desc.info.set_index(context_level());
     vars->Add(desc);
   }
   for (int i = 0; i < this->variables_.length(); i++) {
     LocalVariable* var = variables_[i];
     if ((var->owner() == this) && !var->is_invisible()) {
-      if (!IsInternalIdentifier(var->name())) {
-        // This is a regular Dart variable, either stack-based or captured.
-        VarDesc desc;
-        desc.name = &var->name();
-        if (var->is_captured()) {
-          desc.info.set_kind(RawLocalVarDescriptors::kContextVar);
-          ASSERT(var->owner() != NULL);
-          ASSERT(var->owner()->context_level() >= 0);
-          desc.info.scope_id = var->owner()->context_level();
-        } else {
-          desc.info.set_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.set_index(var->index());
-        vars->Add(desc);
-      } else if (var->name().raw() == Symbols::CurrentContextVar().raw()) {
+      if (var->name().raw() == Symbols::CurrentContextVar().raw()) {
         // 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.set_kind(RawLocalVarDescriptors::kSavedCurrentContext);
         desc.info.scope_id = 0;
         desc.info.begin_pos = 0;
         desc.info.end_pos = 0;
         desc.info.set_index(var->index());
         vars->Add(desc);
-      } else if (var->name().raw() == Symbols::AsyncOperation().raw()) {
-        // The async continuation.
-        ASSERT(var->is_captured());
+      } else if (!IsFilteredIdentifier(var->name())) {
+        // This is a regular Dart variable, either stack-based or captured.
         VarDesc desc;
         desc.name = &var->name();
-        desc.info.set_kind(RawLocalVarDescriptors::kAsyncOperation);
         if (var->is_captured()) {
+          desc.info.set_kind(RawLocalVarDescriptors::kContextVar);
           ASSERT(var->owner() != NULL);
           ASSERT(var->owner()->context_level() >= 0);
           desc.info.scope_id = var->owner()->context_level();
         } else {
+          desc.info.set_kind(RawLocalVarDescriptors::kStackVar);
           desc.info.scope_id = *scope_id;
         }
-        desc.info.begin_pos = 0;
-        desc.info.end_pos = 0;
+        desc.info.begin_pos = var->token_pos();
+        desc.info.end_pos = var->owner()->end_token_pos();
         desc.info.set_index(var->index());
         vars->Add(desc);
       }
     }
   }
   LocalScope* child = this->child();
   while (child != NULL) {
     child->CollectLocalVariables(vars, scope_id);
     child = child->sibling();
   }
@@ skipping 308 matching lines @@
     return fixed_parameter_count - (index() - kParamEndSlotFromFp);
   } else {
     // Shift negative indexes so that the lowest one is 0 (they are still
     // non-positive).
     return fixed_parameter_count - (index() - kFirstLocalSlotFromFp);
   }
 }
 
 
 }  // namespace dart