Cleanups needed for async step-out

runtime/vm/object_store.h

 // 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.
 
 #ifndef RUNTIME_VM_OBJECT_STORE_H_
 #define RUNTIME_VM_OBJECT_STORE_H_
 
 #include "vm/object.h"
 
 namespace dart {
@@ skipping 441 matching lines @@
     async_set_thread_stack_trace_ = func.raw();
     ASSERT(async_set_thread_stack_trace_ != Object::null());
   }
   RawFunction* async_star_move_next_helper() const {
     return async_star_move_next_helper_;
   }
   void set_async_star_move_next_helper(const Function& func) {
     async_star_move_next_helper_ = func.raw();
     ASSERT(async_star_move_next_helper_ != Object::null());
   }
+  RawFunction* complete_on_async_return() const {
+    return complete_on_async_return_;
+  }
+  void set_complete_on_async_return(const Function& func) {
+    complete_on_async_return_ = func.raw();
+    ASSERT(complete_on_async_return_ != Object::null());
+  }
+  RawClass* async_star_stream_controller() const {
+    return async_star_stream_controller_;
+  }
+  void set_async_star_stream_controller(const Class& cls) {
+    async_star_stream_controller_ = cls.raw();
+    ASSERT(async_star_stream_controller_ != Object::null());
+  }
 
   // Visit all object pointers.
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   // Called to initialize objects required by the vm but which invoke
   // dart code.  If an error occurs the error object is returned otherwise
   // a null object is returned.
   RawError* PreallocateObjects();
 
   void InitKnownObjects();
@@ skipping 85 matching lines @@
   V(RawStackTrace*, preallocated_stack_trace_)                                 \
   V(RawFunction*, lookup_port_handler_)                                        \
   V(RawTypedData*, empty_uint32_array_)                                        \
   V(RawFunction*, handle_message_function_)                                    \
   V(RawFunction*, simple_instance_of_function_)                                \
   V(RawFunction*, simple_instance_of_true_function_)                           \
   V(RawFunction*, simple_instance_of_false_function_)                          \
   V(RawFunction*, async_clear_thread_stack_trace_)                             \
   V(RawFunction*, async_set_thread_stack_trace_)                               \
   V(RawFunction*, async_star_move_next_helper_)                                \
+  V(RawFunction*, complete_on_async_return_)                                   \
+  V(RawClass*, async_star_stream_controller_)                                  \
   V(RawArray*, library_load_error_table_)                                      \
   V(RawArray*, unique_dynamic_targets_)                                        \
   V(RawGrowableObjectArray*, token_objects_)                                   \
   V(RawArray*, token_objects_map_)                                             \
   V(RawGrowableObjectArray*, megamorphic_cache_table_)                         \
   V(RawCode*, megamorphic_miss_code_)                                          \
   V(RawFunction*, megamorphic_miss_function_)                                  \
   // Please remember the last entry must be referred in the 'to' function below.
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&object_class_); }
@@ skipping 22 matching lines @@
 
   friend class Serializer;
   friend class Deserializer;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectStore);
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_OBJECT_STORE_H_