Fix more async machinery (capture return value when necessary, issue 22620).

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 103 matching lines @@
     ASSERT(has_finally_return_temp_var());
     return finally_return_temp_var_;
   }
   void set_finally_return_temp_var(LocalVariable* value) {
     ASSERT(!has_finally_return_temp_var());
     finally_return_temp_var_ = value;
   }
   bool has_finally_return_temp_var() const {
     return finally_return_temp_var_ != NULL;
   }
-  void EnsureFinallyReturnTemp();
+  void EnsureFinallyReturnTemp(bool is_async);
 
   LocalVariable* EnsureExpressionTemp();
 
   bool HasDeferredPrefixes() const { return deferred_prefixes_->length() != 0; }
   ZoneGrowableArray<const LibraryPrefix*>* deferred_prefixes() const {
     return deferred_prefixes_;
   }
   void AddDeferredPrefix(const LibraryPrefix& prefix);
 
   ZoneGrowableArray<const Field*>* guarded_fields() const {
@@ skipping 490 matching lines @@
   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
   // inlined finally code if needed.
   void AddNodeForFinallyInlining(AstNode* node);
   // Add the inlined finally block to the specified node.
-  void AddFinallyBlockToNode(AstNode* node, InlinedFinallyNode* finally_node);
+  void AddFinallyBlockToNode(bool is_async,
+                             AstNode* node,
+                             InlinedFinallyNode* finally_node);
   AstNode* ParseTryStatement(String* label_name);
   RawAbstractType* ParseConstFinalVarOrType(
       ClassFinalizer::FinalizationKind finalization);
   AstNode* ParseVariableDeclaration(const AbstractType& type,
                                     bool is_final,
                                     bool is_const,
                                     SequenceNode** await_preamble);
   AstNode* ParseVariableDeclarationList();
   AstNode* ParseFunctionStatement(bool is_literal);
   AstNode* ParseYieldStatement();
@@ skipping 207 matching lines @@
 
   // Indentation of parser trace.
   intptr_t trace_indent_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_