Fix returning from async functions.

runtime/vm/ast.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 VM_AST_H_
 #define VM_AST_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
@@ skipping 144 matching lines @@
       label_(NULL) {
   }
 
   LocalScope* scope() const { return scope_; }
 
   SourceLabel* label() const { return label_; }
   void set_label(SourceLabel* value) { label_ = value; }
 
   void VisitChildren(AstNodeVisitor* visitor) const;
 
-  void Add(AstNode* node) { nodes_.Add(node); }
+  void Add(AstNode* node);
   intptr_t length() const { return nodes_.length(); }
   AstNode* NodeAt(intptr_t index) const { return nodes_[index]; }
   void ReplaceNodeAt(intptr_t index, AstNode* value) { nodes_[index] = value; }
 
   DECLARE_COMMON_NODE_FUNCTIONS(SequenceNode);
 
   // Collects all nodes accessible from this sequence node into array 'nodes'.
   void CollectAllNodes(GrowableArray<AstNode*>* nodes);
 
  private:
@@ skipping 339 matching lines @@
 };
 
 
 class ReturnNode : public AstNode {
  public:
   // Return from a void function returns the null object.
   explicit ReturnNode(intptr_t token_pos)
       : AstNode(token_pos),
         value_(new LiteralNode(token_pos, Instance::ZoneHandle())),
         inlined_finally_list_(),
-        saved_return_value_var_(NULL) { }
+        saved_return_value_var_(NULL),
+        is_regular_return_(true) { }
   // Return from a non-void function.
   ReturnNode(intptr_t token_pos,
              AstNode* value)
       : AstNode(token_pos),
         value_(value),
         inlined_finally_list_(),
-        saved_return_value_var_(NULL) {
+        saved_return_value_var_(NULL),
+        is_regular_return_(true) {
     ASSERT(value_ != NULL);
   }
 
   AstNode* value() const { return value_; }
 
   intptr_t inlined_finally_list_length() const {
     return inlined_finally_list_.length();
   }
   InlinedFinallyNode* InlinedFinallyNodeAt(intptr_t index) const {
     return inlined_finally_list_[index];
   }
   void AddInlinedFinallyNode(InlinedFinallyNode* finally_node) {
     inlined_finally_list_.Add(finally_node);
   }
 
   LocalVariable* saved_return_value_var() const {
     return saved_return_value_var_;
   }
   void set_saved_return_value_var(LocalVariable* var) {
     saved_return_value_var_ = var;
   }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     if (value() != NULL) {
       value()->Visit(visitor);
     }
   }
 
+  void set_scope(LocalScope* scope) { scope_ = scope; }
+  LocalScope* scope() const { return scope_; }
+
+  // Returns true if the return node is not used to return from a continuation.

[srdjan, 2014/08/12 21:39:24]

Simplify: returns false if the return node is used to return from a
continuation. TODO(..): implement ... so that it is clear that it will be set to
false later.

[Michael Lippautz (Google), 2014/08/12 21:50:51]

Done.

+  bool is_regular_return() const { return is_regular_return_; }
+
   DECLARE_COMMON_NODE_FUNCTIONS(ReturnNode);
 
  private:
   AstNode* value_;
   GrowableArray<InlinedFinallyNode*> inlined_finally_list_;
   LocalVariable* saved_return_value_var_;
+  LocalScope* scope_;
+  bool is_regular_return_;
 
   DISALLOW_COPY_AND_ASSIGN(ReturnNode);
 };
 
 
 class ComparisonNode : public AstNode {
  public:
   ComparisonNode(intptr_t token_pos,
                  Token::Kind kind,
                  AstNode* left,
@@ skipping 1227 matching lines @@
   const intptr_t try_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_