Fix issue 23500

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 600 matching lines @@
                                   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(bool is_async,
-                                  LocalVariable* exception_var,
-                                  LocalVariable* stack_trace_var,
-                                  LocalVariable* rethrow_exception_var,
-                                  LocalVariable* rethrow_stack_trace_var);
+  // Parse or generate a finally clause.
+  SequenceNode* EnsureFinallyClause(bool parse,
+                                    bool is_async,
+                                    LocalVariable* exception_var,
+                                    LocalVariable* stack_trace_var,
+                                    LocalVariable* rethrow_exception_var,
+                                    LocalVariable* rethrow_stack_trace_var);
   // Push try block onto the stack of try blocks in scope.
   void PushTry(Block* try_block);
   // Pop the inner most try block from the stack.
   TryStack* PopTry();
   // Collect saved try context variables if await or yield is in try block.
   void CheckAsyncOpInTryBlock(
       LocalVariable** saved_try_ctx,
       LocalVariable** async_saved_try_ctx,
       LocalVariable** outer_saved_try_ctx,
       LocalVariable** outer_async_saved_try_ctx) 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(bool is_async,
-                             AstNode* node,
-                             InlinedFinallyNode* finally_node);
+  // Add the inlined finally clause to the specified node.
+  void AddFinallyClauseToNode(bool is_async,
+                              AstNode* node,
+                              InlinedFinallyNode* finally_clause);
   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 203 matching lines @@
 
   // Indentation of parser trace.
   intptr_t trace_indent_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_