One more fix to async machinery (rethrow in finally, issue 22595).

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 1767 matching lines @@
 class CatchClauseNode : public AstNode {
  public:
   static const intptr_t kInvalidTryIndex = -1;
 
   CatchClauseNode(intptr_t token_pos,
                   SequenceNode* catch_block,
                   const Array& handler_types,
                   const LocalVariable* context_var,
                   const LocalVariable* exception_var,
                   const LocalVariable* stacktrace_var,
+                  const LocalVariable* rethrow_exception_var,
+                  const LocalVariable* rethrow_stacktrace_var,
                   intptr_t catch_handler_index,
                   bool needs_stacktrace)
       : AstNode(token_pos),
         catch_block_(catch_block),
         handler_types_(handler_types),
         context_var_(*context_var),
         exception_var_(*exception_var),
         stacktrace_var_(*stacktrace_var),
+        rethrow_exception_var_(*rethrow_exception_var),
+        rethrow_stacktrace_var_(*rethrow_stacktrace_var),
         catch_handler_index_(catch_handler_index),
         needs_stacktrace_(needs_stacktrace) {
     ASSERT(catch_block_ != NULL);
     ASSERT(handler_types.IsZoneHandle());
     ASSERT(context_var != NULL);
     ASSERT(exception_var != NULL);
     ASSERT(stacktrace_var != NULL);
   }
 
   const Array& handler_types() const { return handler_types_; }
   const LocalVariable& context_var() const { return context_var_; }
   const LocalVariable& exception_var() const { return exception_var_; }
   const LocalVariable& stacktrace_var() const { return stacktrace_var_; }
+  const LocalVariable& rethrow_exception_var() const {
+      return rethrow_exception_var_;
+  }
+  const LocalVariable& rethrow_stacktrace_var() const {
+      return rethrow_stacktrace_var_;
+  }
   intptr_t catch_handler_index() const { return catch_handler_index_; }
   bool needs_stacktrace() const { return needs_stacktrace_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     catch_block_->Visit(visitor);
   }
 
   DECLARE_COMMON_NODE_FUNCTIONS(CatchClauseNode);
 
  private:
   SequenceNode* catch_block_;
   const Array& handler_types_;
   const LocalVariable& context_var_;
   const LocalVariable& exception_var_;
   const LocalVariable& stacktrace_var_;
+  const LocalVariable& rethrow_exception_var_;
+  const LocalVariable& rethrow_stacktrace_var_;
   const intptr_t catch_handler_index_;
   const bool needs_stacktrace_;
 
   DISALLOW_COPY_AND_ASSIGN(CatchClauseNode);
 };
 
 
 class TryCatchNode : public AstNode {
  public:
   TryCatchNode(intptr_t token_pos,
@@ skipping 99 matching lines @@
   const intptr_t try_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_