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

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 11438 matching lines @@
 }
 
 
 void LocalVarDescriptors::GetInfo(intptr_t var_index,
                                   RawLocalVarDescriptors::VarInfo* info) const {
   ASSERT(var_index < Length());
   *info = raw()->data()[var_index];
 }
 
 
 static const char* VarKindString(int kind) {

[Florian Schneider, 2015/09/28 10:58:05]

s/VarKindString/LocalVarDescriptors::KindToString/g

   switch (kind) {
     case RawLocalVarDescriptors::kStackVar:
       return "StackVar";
       break;
     case RawLocalVarDescriptors::kContextVar:
       return "ContextVar";
       break;
     case RawLocalVarDescriptors::kContextLevel:
       return "ContextLevel";
       break;
     case RawLocalVarDescriptors::kSavedCurrentContext:
       return "CurrentCtx";
       break;
-    case RawLocalVarDescriptors::kAsyncOperation:
-      return "AsyncOperation";
-      break;
     default:
       UNREACHABLE();
       return "Unknown";
   }
 }
 
 
 static int PrintVarInfo(char* buffer, int len,
                         intptr_t i,
                         const String& var_name,
@@ skipping 86 matching lines @@
     var.AddProperty("name", var_name.ToCString());
     var.AddProperty("index", static_cast<intptr_t>(info.index()));
     var.AddProperty("beginPos", static_cast<intptr_t>(info.begin_pos));
     var.AddProperty("endPos", static_cast<intptr_t>(info.end_pos));
     var.AddProperty("scopeId", static_cast<intptr_t>(info.scope_id));
     var.AddProperty("kind", KindToStr(info.kind()));
   }
 }
 
 
 const char* LocalVarDescriptors::KindToStr(intptr_t kind) {

[Florian Schneider, 2015/09/28 10:58:05]

s/intptr_t kind/RawLocalVarDescriptors::VarInfoKind kind/

   switch (kind) {
     case RawLocalVarDescriptors::kStackVar:
       return "StackVar";
     case RawLocalVarDescriptors::kContextVar:
       return "ContextVar";
     case RawLocalVarDescriptors::kContextLevel:
       return "ContextLevel";
     case RawLocalVarDescriptors::kSavedCurrentContext:
       return "SavedCurrentContext";
-    case RawLocalVarDescriptors::kAsyncOperation:
-      return "AsyncOperation";
     default:
       UNIMPLEMENTED();
       return NULL;
   }
 }
 
 RawLocalVarDescriptors* LocalVarDescriptors::New(intptr_t num_variables) {
   ASSERT(Object::var_descriptors_class() != Class::null());
   if (num_variables < 0 || num_variables > kMaxElements) {
     // This should be caught before we reach here.
@@ skipping 9847 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart