Fix stack height assertion code and free up a bit in the Function tag bits.

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 491 matching lines @@
   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_() { }
+        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_() {
+      : 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,
@@ skipping 447 matching lines @@
   const char* TokenName() const;
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   DECLARE_COMMON_NODE_FUNCTIONS(JumpNode);
 
  private:
   Token::Kind kind_;
   SourceLabel* label_;
   GrowableArray<InlinedFinallyNode*> inlined_finally_list_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(JumpNode);
 };
 
 
 class LoadLocalNode : public AstNode {
  public:
   LoadLocalNode(intptr_t token_pos, const LocalVariable* local)
       : AstNode(token_pos), local_(*local) {
     ASSERT(local != NULL);
   }
@@ skipping 753 matching lines @@
   const intptr_t try_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_