Await always waits

runtime/vm/flow_graph_builder.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_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/allocation.h"
@@ skipping 160 matching lines @@
   intptr_t loop_depth() const { return loop_depth_; }
 
   // Manage the currently active try index.
   void set_try_index(intptr_t value) { try_index_ = value; }
   intptr_t try_index() const { return try_index_; }
 
   // Manage the currently active catch-handler try index.
   void set_catch_try_index(intptr_t value) { catch_try_index_ = value; }
   intptr_t catch_try_index() const { return catch_try_index_; }
 
-  intptr_t next_await_counter() { return jump_cnt_++; }
-
-  ZoneGrowableArray<intptr_t>* await_levels() const { return await_levels_; }
-  ZoneGrowableArray<JoinEntryInstr*>* await_joins() const {
-    return await_joins_;
+  intptr_t next_await_counter() {
+    return graph_entry_->next_await_counter();
+  }
+  ZoneGrowableArray<intptr_t>& await_levels() const {
+    return graph_entry_->await_levels();
+  }
+  ZoneGrowableArray<JoinEntryInstr*>& await_joins() const {
+    return graph_entry_->await_joins();
   }
 
   void AddCatchEntry(CatchBlockEntryInstr* entry);
 
   intptr_t num_copied_params() const {
     return num_copied_params_;
   }
   intptr_t num_non_copied_params() const {
     return num_non_copied_params_;
   }
@@ skipping 65 matching lines @@
   // Outgoing argument stack height.
   intptr_t args_pushed_;
 
   // A stack of enclosing nested statements.
   NestedStatement* nesting_stack_;
 
   // The deopt id of the OSR entry or Isolate::kNoDeoptId if not compiling
   // for OSR.
   const intptr_t osr_id_;
 
-  intptr_t jump_cnt_;
-  ZoneGrowableArray<JoinEntryInstr*>* await_joins_;
-  ZoneGrowableArray<intptr_t>* await_levels_;
-
   DISALLOW_IMPLICIT_CONSTRUCTORS(FlowGraphBuilder);
 };
 
 
 // Translate an AstNode to a control-flow graph fragment for its effects
 // (e.g., a statement or an expression in an effect context).  Implements a
 // function from an AstNode and next temporary index to a graph fragment
 // with a single entry and at most one exit.  The fragment is represented by
 // an (entry, exit) pair of Instruction pointers:
 //
@@ skipping 313 matching lines @@
   // Output parameters.
   GrowableArray<TargetEntryInstr**> true_successor_addresses_;
   GrowableArray<TargetEntryInstr**> false_successor_addresses_;
 
   intptr_t condition_token_pos_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_