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 128 matching lines @@
 
  protected:
   friend class ParsedFunction;
 
  private:
   const intptr_t token_pos_;
   DISALLOW_COPY_AND_ASSIGN(AstNode);
 };
 
 
+class LiteralNode : public AstNode {
+ public:
+  LiteralNode(intptr_t token_pos, const Instance& literal)
+      : AstNode(token_pos), literal_(literal) {
+    ASSERT(literal_.IsNotTemporaryScopedHandle());
+    ASSERT(literal_.IsSmi() || literal_.IsOld());
+#if defined(DEBUG)
+    if (literal_.IsString()) {
+      ASSERT(String::Cast(literal_).IsSymbol());
+    }
+#endif  // defined(DEBUG)
+    ASSERT(literal_.IsNull() ||
+           Class::Handle(literal_.clazz()).is_finalized() ||
+           Class::Handle(literal_.clazz()).is_prefinalized());
+  }
+
+  const Instance& literal() const { return literal_; }
+
+  virtual bool IsPotentiallyConst() const;
+  virtual const Instance* EvalConstExpr() const {
+    return &literal();
+  }
+
+  virtual void VisitChildren(AstNodeVisitor* visitor) const { }
+
+  virtual AstNode* ApplyUnaryOp(Token::Kind unary_op_kind);
+
+  DECLARE_COMMON_NODE_FUNCTIONS(LiteralNode);
+
+ private:
+  const Instance& literal_;
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(LiteralNode);
+};
+
+
+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),
+        scope_(NULL) { }
+  // 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),
+        scope_(NULL) {
+    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_; }
+
+  DECLARE_COMMON_NODE_FUNCTIONS(ReturnNode);
+
+ private:
+  AstNode* value_;
+  GrowableArray<InlinedFinallyNode*> inlined_finally_list_;
+  LocalVariable* saved_return_value_var_;
+  LocalScope* scope_;
+
+  DISALLOW_COPY_AND_ASSIGN(ReturnNode);
+};
+
+
 class SequenceNode : public AstNode {
  public:
   SequenceNode(intptr_t token_pos, LocalScope* scope)
     : AstNode(token_pos),
       scope_(scope),
       nodes_(4),
       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) {

[hausner, 2014/08/12 20:51:26]

This should now maybe go into the .cc file. Then you can also avoid the
re-ordering of class declarations.

[Michael Lippautz (Google), 2014/08/12 21:13:57]

Done.

+    if (node->IsReturnNode()) {
+      node->AsReturnNode()->set_scope(scope());
+    }
+    nodes_.Add(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 146 matching lines @@
 
   DECLARE_COMMON_NODE_FUNCTIONS(StringInterpolateNode);
 
  private:
   ArrayNode* value_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StringInterpolateNode);
 };
 
 
-class LiteralNode : public AstNode {
- public:
-  LiteralNode(intptr_t token_pos, const Instance& literal)
-      : AstNode(token_pos), literal_(literal) {
-    ASSERT(literal_.IsNotTemporaryScopedHandle());
-    ASSERT(literal_.IsSmi() || literal_.IsOld());
-#if defined(DEBUG)
-    if (literal_.IsString()) {
-      ASSERT(String::Cast(literal_).IsSymbol());
-    }
-#endif  // defined(DEBUG)
-    ASSERT(literal_.IsNull() ||
-           Class::Handle(literal_.clazz()).is_finalized() ||
-           Class::Handle(literal_.clazz()).is_prefinalized());
-  }
-
-  const Instance& literal() const { return literal_; }
-
-  virtual bool IsPotentiallyConst() const;
-  virtual const Instance* EvalConstExpr() const {
-    return &literal();
-  }
-
-  virtual void VisitChildren(AstNodeVisitor* visitor) const { }
-
-  virtual AstNode* ApplyUnaryOp(Token::Kind unary_op_kind);
-
-  DECLARE_COMMON_NODE_FUNCTIONS(LiteralNode);
-
- private:
-  const Instance& literal_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(LiteralNode);
-};
-
-
 class TypeNode : public AstNode {
  public:
   TypeNode(intptr_t token_pos, const AbstractType& type)
       : AstNode(token_pos), type_(type) {
     ASSERT(type_.IsZoneHandle());
     ASSERT(!type_.IsNull());
     ASSERT(type_.IsFinalized());
     // A wellformed literal Type must be canonical.
     ASSERT(!type_.IsType() ||
            type_.IsMalformedOrMalbounded() ||
@@ skipping 130 matching lines @@
   DECLARE_COMMON_NODE_FUNCTIONS(PrimaryNode);
 
  private:
   const Object& primary_;
   bool is_deferred_reference_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PrimaryNode);
 };
 
 
-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) { }
-  // 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) {
-    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);
-    }
-  }
-
-  DECLARE_COMMON_NODE_FUNCTIONS(ReturnNode);
-
- private:
-  AstNode* value_;
-  GrowableArray<InlinedFinallyNode*> inlined_finally_list_;
-  LocalVariable* saved_return_value_var_;
-
-  DISALLOW_COPY_AND_ASSIGN(ReturnNode);
-};
-
-
 class ComparisonNode : public AstNode {
  public:
   ComparisonNode(intptr_t token_pos,
                  Token::Kind kind,
                  AstNode* left,
                  AstNode* right)
   : AstNode(token_pos), kind_(kind), left_(left), right_(right) {
     ASSERT(left_ != NULL);
     ASSERT(right_ != NULL);
     ASSERT(IsKindValid());
@@ skipping 1222 matching lines @@
   const intptr_t try_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_