Fix async machinery for finally clauses (issues 22445, 22300).

runtime/vm/parser.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_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "platform/assert.h"
@@ skipping 574 matching lines @@
   RawClass* CheckCaseExpressions(const GrowableArray<LiteralNode*>& values);
   CaseNode* ParseCaseClause(LocalVariable* switch_expr_value,
                             GrowableArray<LiteralNode*>* case_expr_values,
                             SourceLabel* case_label);
   AstNode* ParseSwitchStatement(String* label_name);
 
   // try/catch/finally parsing.
   void AddCatchParamsToScope(CatchParamDesc* exception_param,
                              CatchParamDesc* stack_trace_param,
                              LocalScope* scope);
-  void SaveExceptionAndStacktrace(LocalVariable* exception_var,
+  void SetupExceptionVariables(LocalScope* try_scope,
+                               bool is_async,
+                               LocalVariable** context_var,
+                               LocalVariable** exception_var,
+                               LocalVariable** stack_trace_var,
+                               LocalVariable** saved_exception_var,
+                               LocalVariable** saved_stack_trace_var);
+  void SaveExceptionAndStacktrace(SequenceNode* statements,
+                                  LocalVariable* exception_var,
                                   LocalVariable* stack_trace_var,
                                   LocalVariable* saved_exception_var,
                                   LocalVariable* saved_stack_trace_var);
   // Parse all the catch clause of a try.
   SequenceNode* ParseCatchClauses(intptr_t handler_pos,
+                                  bool is_async,
                                   LocalVariable* exception_var,
                                   LocalVariable* stack_trace_var,
                                   LocalVariable* rethrow_exception_var,
                                   LocalVariable* rethrow_stack_trace_var,
                                   const GrowableObjectArray& handler_types,
                                   bool* needs_stack_trace);
   // Parse finally block and create an AST for it.
-  SequenceNode* ParseFinallyBlock();
+  SequenceNode* ParseFinallyBlock(bool is_async,
+                                  LocalVariable* exception_var,
+                                  LocalVariable* stack_trace_var,
+                                  LocalVariable* rethrow_exception_var,
+                                  LocalVariable* rethrow_stack_trace_var);
   // Adds try block to the list of try blocks seen so far.
   void PushTryBlock(Block* try_block);
   // Pops the inner most try block from the list.
   TryBlocks* PopTryBlock();
   // Collect try block scopes and indices if await or yield is in try block.
   void CheckAsyncOpInTryBlock(LocalScope** try_scope,
                               int16_t* try_index,
                               LocalScope** outer_try_scope,
                               int16_t* outer_try_index) const;
   // Add specified node to try block list so that it can be patched with
@@ skipping 221 matching lines @@
 
   // Indentation of parser trace.
   intptr_t trace_indent_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_